git_diff_option_t

Flags for diff options. A combination of these flags can be passed in via the flags value in the git_diff_options.

Values

ValueMeaning
GIT_DIFF_NORMAL0

Normal diff, the default

GIT_DIFF_REVERSE1u << 0

Reverse the sides of the diff

GIT_DIFF_INCLUDE_IGNORED1u << 1

Include ignored files in the diff

GIT_DIFF_RECURSE_IGNORED_DIRS1u << 2

Even with GIT_DIFF_INCLUDE_IGNORED, an entire ignored directory will be marked with only a single entry in the diff; this flag adds all files under the directory as IGNORED entries, too.

GIT_DIFF_INCLUDE_UNTRACKED1u << 3

Include untracked files in the diff

GIT_DIFF_RECURSE_UNTRACKED_DIRS1u << 4

Even with GIT_DIFF_INCLUDE_UNTRACKED, an entire untracked directory will be marked with only a single entry in the diff (a la what core Git does in git status); this flag adds *all* files under untracked directories as UNTRACKED entries, too.

GIT_DIFF_INCLUDE_UNMODIFIED1u << 5

Include unmodified files in the diff

GIT_DIFF_INCLUDE_TYPECHANGE1u << 6

Normally, a type change between files will be converted into a DELETED record for the old and an ADDED record for the new; this options enabled the generation of TYPECHANGE delta records.

GIT_DIFF_INCLUDE_TYPECHANGE_TREES1u << 7

Even with GIT_DIFF_INCLUDE_TYPECHANGE, blob->tree changes still generally show as a DELETED blob. This flag tries to correctly label blob->tree transitions as TYPECHANGE records with new_file's mode set to tree. Note: the tree SHA will not be available.

GIT_DIFF_IGNORE_FILEMODE1u << 8

Ignore file mode changes

GIT_DIFF_IGNORE_SUBMODULES1u << 9

Treat all submodules as unmodified

GIT_DIFF_IGNORE_CASE1u << 10

Use case insensitive filename comparisons

GIT_DIFF_INCLUDE_CASECHANGE1u << 11

May be combined with GIT_DIFF_IGNORE_CASE to specify that a file that has changed case will be returned as an add/delete pair.

GIT_DIFF_DISABLE_PATHSPEC_MATCH1u << 12

If the pathspec is set in the diff options, this flags indicates that the paths will be treated as literal paths instead of fnmatch patterns. Each path in the list must either be a full path to a file or a directory. (A trailing slash indicates that the path will _only_ match a directory). If a directory is specified, all children will be included.

GIT_DIFF_SKIP_BINARY_CHECK1u << 13

Disable updating of the binary flag in delta records. This is useful when iterating over a diff if you don't need hunk and data callbacks and want to avoid having to load file completely.

GIT_DIFF_ENABLE_FAST_UNTRACKED_DIRS1u << 14

When diff finds an untracked directory, to match the behavior of core Git, it scans the contents for IGNORED and UNTRACKED files. If *all* contents are IGNORED, then the directory is IGNORED; if any contents are not IGNORED, then the directory is UNTRACKED. This is extra work that may not matter in many cases. This flag turns off that scan and immediately labels an untracked directory as UNTRACKED (changing the behavior to not match core Git).

GIT_DIFF_UPDATE_INDEX1u << 15

When diff finds a file in the working directory with stat information different from the index, but the OID ends up being the same, write the correct stat information into the index. Note: without this flag, diff will always leave the index untouched.

GIT_DIFF_INCLUDE_UNREADABLE1u << 16

Include unreadable files in the diff

GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED1u << 17

Include unreadable files in the diff

GIT_DIFF_INDENT_HEURISTIC1u << 18

Use a heuristic that takes indentation and whitespace into account which generally can produce better diffs when dealing with ambiguous diff hunks.

GIT_DIFF_FORCE_TEXT1u << 20

Treat all files as text, disabling binary attributes & detection

GIT_DIFF_FORCE_BINARY1u << 21

Treat all files as binary, disabling text diffs

GIT_DIFF_IGNORE_WHITESPACE1u << 22

Ignore all whitespace

GIT_DIFF_IGNORE_WHITESPACE_CHANGE1u << 23

Ignore changes in amount of whitespace

GIT_DIFF_IGNORE_WHITESPACE_EOL1u << 24

Ignore whitespace at end of line

GIT_DIFF_SHOW_UNTRACKED_CONTENT1u << 25

When generating patch text, include the content of untracked files. This automatically turns on GIT_DIFF_INCLUDE_UNTRACKED but it does not turn on GIT_DIFF_RECURSE_UNTRACKED_DIRS. Add that flag if you want the content of every single UNTRACKED file.

GIT_DIFF_SHOW_UNMODIFIED1u << 26

When generating output, include the names of unmodified files if they are included in the git_diff. Normally these are skipped in the formats that list files (e.g. name-only, name-status, raw). Even with this, these will not be included in patch format.

GIT_DIFF_PATIENCE1u << 28

Use the "patience diff" algorithm

GIT_DIFF_MINIMAL1u << 29

Take extra time to find minimal diff

GIT_DIFF_SHOW_BINARY1u << 30

Include the necessary deflate / delta information so that git-apply can apply given diff information to binary files.

Meta