1// Please don't remove this comment as asciidoc behaves badly when 2// the first non-empty line is ifdef/ifndef. The symptom is that 3// without this comment the <git-diff-core> attribute conditionally 4// defined below ends up being defined unconditionally. 5// Last checked with asciidoc 7.0.2. 6 7ifndef::git-format-patch[] 8ifndef::git-diff[] 9ifndef::git-log[] 10:git-diff-core: 1 11endif::git-log[] 12endif::git-diff[] 13endif::git-format-patch[] 14 15ifdef::git-format-patch[] 16-p:: 17 Generate patches without diffstat. 18endif::git-format-patch[] 19 20ifndef::git-format-patch[] 21-p:: 22-u:: 23 Generate patch (see section on generating patches). 24 {git-diff? This is the default.} 25endif::git-format-patch[] 26 27-U<n>:: 28--unified=<n>:: 29 Generate diffs with <n> lines of context instead of 30 the usual three. Implies "-p". 31 32--raw:: 33 Generate the raw format. 34 {git-diff-core? This is the default.} 35 36--patch-with-raw:: 37 Synonym for "-p --raw". 38 39--stat[=width[,name-width]]:: 40 Generate a diffstat. You can override the default 41 output width for 80-column terminal by "--stat=width". 42 The width of the filename part can be controlled by 43 giving another width to it separated by a comma. 44 45--numstat:: 46 Similar to \--stat, but shows number of added and 47 deleted lines in decimal notation and pathname without 48 abbreviation, to make it more machine friendly. For 49 binary files, outputs two `-` instead of saying 50 `0 0`. 51 52--shortstat:: 53 Output only the last line of the --stat format containing total 54 number of modified files, as well as number of added and deleted 55 lines. 56 57--dirstat[=limit]:: 58 Output the distribution of relative amount of changes (number of lines added or 59 removed) for each sub-directory. Directories with changes below 60 a cut-off percent (3% by default) are not shown. The cut-off percent 61 can be set with "--dirstat=limit". Changes in a child directory is not 62 counted for the parent directory, unless "--cumulative" is used. 63 64--dirstat-by-file[=limit]:: 65 Same as --dirstat, but counts changed files instead of lines. 66 67--summary:: 68 Output a condensed summary of extended header information 69 such as creations, renames and mode changes. 70 71--patch-with-stat:: 72 Synonym for "-p --stat". 73 {git-format-patch? This is the default.} 74 75-z:: 76 NUL-line termination on output. This affects the --raw 77 output field terminator. Also output from commands such 78 as "git-log" will be delimited with NUL between commits. 79 80--name-only:: 81 Show only names of changed files. 82 83--name-status:: 84 Show only names and status of changed files. See the description 85 of the `--diff-filter` option on what the status letters mean. 86 87--color:: 88 Show colored diff. 89 90--no-color:: 91 Turn off colored diff, even when the configuration file 92 gives the default to color output. 93 94--color-words[=regex]:: 95 Show colored word diff, i.e. color words which have changed. 96+ 97Optionally, you can pass a regular expression that tells Git what the 98words are that you are looking for; The default is to interpret any 99stretch of non-whitespace as a word. 100 101--no-renames:: 102 Turn off rename detection, even when the configuration 103 file gives the default to do so. 104 105--check:: 106 Warn if changes introduce trailing whitespace 107 or an indent that uses a space before a tab. Exits with 108 non-zero status if problems are found. Not compatible with 109 --exit-code. 110 111--full-index:: 112 Instead of the first handful of characters, show the full 113 pre- and post-image blob object names on the "index" 114 line when generating patch format output. 115 116--binary:: 117 In addition to --full-index, output "binary diff" that 118 can be applied with "git apply". 119 120--abbrev[=<n>]:: 121 Instead of showing the full 40-byte hexadecimal object 122 name in diff-raw format output and diff-tree header 123 lines, show only a partial prefix. This is 124 independent of --full-index option above, which controls 125 the diff-patch output format. Non default number of 126 digits can be specified with --abbrev=<n>. 127 128-B:: 129 Break complete rewrite changes into pairs of delete and create. 130 131-M:: 132 Detect renames. 133 134-C:: 135 Detect copies as well as renames. See also `--find-copies-harder`. 136 137--diff-filter=[ACDMRTUXB*]:: 138 Select only files that are Added (`A`), Copied (`C`), 139 Deleted (`D`), Modified (`M`), Renamed (`R`), have their 140 type (i.e. regular file, symlink, submodule, ...) changed (`T`), 141 are Unmerged (`U`), are 142 Unknown (`X`), or have had their pairing Broken (`B`). 143 Any combination of the filter characters may be used. 144 When `*` (All-or-none) is added to the combination, all 145 paths are selected if there is any file that matches 146 other criteria in the comparison; if there is no file 147 that matches other criteria, nothing is selected. 148 149--find-copies-harder:: 150 For performance reasons, by default, `-C` option finds copies only 151 if the original file of the copy was modified in the same 152 changeset. This flag makes the command 153 inspect unmodified files as candidates for the source of 154 copy. This is a very expensive operation for large 155 projects, so use it with caution. Giving more than one 156 `-C` option has the same effect. 157 158-l<num>:: 159 -M and -C options require O(n^2) processing time where n 160 is the number of potential rename/copy targets. This 161 option prevents rename/copy detection from running if 162 the number of rename/copy targets exceeds the specified 163 number. 164 165-S<string>:: 166 Look for differences that contain the change in <string>. 167 168--pickaxe-all:: 169 When -S finds a change, show all the changes in that 170 changeset, not just the files that contain the change 171 in <string>. 172 173--pickaxe-regex:: 174 Make the <string> not a plain string but an extended POSIX 175 regex to match. 176 177-O<orderfile>:: 178 Output the patch in the order specified in the 179 <orderfile>, which has one shell glob pattern per line. 180 181-R:: 182 Swap two inputs; that is, show differences from index or 183 on-disk file to tree contents. 184 185--relative[=<path>]:: 186 When run from a subdirectory of the project, it can be 187 told to exclude changes outside the directory and show 188 pathnames relative to it with this option. When you are 189 not in a subdirectory (e.g. in a bare repository), you 190 can name which subdirectory to make the output relative 191 to by giving a <path> as an argument. 192 193-a:: 194--text:: 195 Treat all files as text. 196 197--ignore-space-at-eol:: 198 Ignore changes in whitespace at EOL. 199 200-b:: 201--ignore-space-change:: 202 Ignore changes in amount of whitespace. This ignores whitespace 203 at line end, and considers all other sequences of one or 204 more whitespace characters to be equivalent. 205 206-w:: 207--ignore-all-space:: 208 Ignore whitespace when comparing lines. This ignores 209 differences even if one line has whitespace where the other 210 line has none. 211 212--inter-hunk-context=<lines>:: 213 Show the context between diff hunks, up to the specified number 214 of lines, thereby fusing hunks that are close to each other. 215 216--exit-code:: 217 Make the program exit with codes similar to diff(1). 218 That is, it exits with 1 if there were differences and 219 0 means no differences. 220 221--quiet:: 222 Disable all output of the program. Implies --exit-code. 223 224--ext-diff:: 225 Allow an external diff helper to be executed. If you set an 226 external diff driver with linkgit:gitattributes[5], you need 227 to use this option with linkgit:git-log[1] and friends. 228 229--no-ext-diff:: 230 Disallow external diff drivers. 231 232--ignore-submodules:: 233 Ignore changes to submodules in the diff generation. 234 235--src-prefix=<prefix>:: 236 Show the given source prefix instead of "a/". 237 238--dst-prefix=<prefix>:: 239 Show the given destination prefix instead of "b/". 240 241--no-prefix:: 242 Do not show any source or destination prefix. 243 244For more detailed explanation on these common options, see also 245linkgit:gitdiffcore[7].