1 .\"Generated by db2man.xsl. Don't modify this, modify the source.
10 .de Sp \" Vertical space (when we can't use .PP)
16 .ie \\n(.$>=3 .ne \\$3
20 .TH "GIT-DIFF-STAGES" 1 "" "" ""
22 git-diff-stages \- Compares content and mode of blobs between stages in an unmerged index file
26 \fIgit\-diff\-stages\fR [<common diff options>] <stage1> <stage2> [<path>...]
31 Compares the content and mode of the blobs in two stages in an unmerged index file\&.
37 Generate patch (see section on generating patches)
45 \\0 line termination on output
49 Show only names of changed files\&.
53 Show only names and status of changed files\&.
57 Instead of the first handful characters, show full object name of pre\- and post\-image blob on the "index" line when generating a patch format output\&.
61 Instead of showing the full 40\-byte hexadecimal object name in diff\-raw format output and diff\-tree header lines, show only handful hexdigits prefix\&. This is independent of \-\-full\-index option above, which controls the diff\-patch output format\&. Non default number of digits can be specified with \-\-abbrev=<n>\&.
65 Break complete rewrite changes into pairs of delete and create\&.
73 Detect copies as well as renames\&.
76 \-\-diff\-filter=[ACDMRTUXB*]
77 Select only files that are Added (A), Copied (C), Deleted (D), Modified (M), Renamed (R), have their type (mode) changed (T), are Unmerged (U), are Unknown (X), or have had their pairing Broken (B)\&. Any combination of the filter characters may be used\&. When * (All\-or\-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected\&.
80 \-\-find\-copies\-harder
81 For performance reasons, by default, \-C option finds copies only if the original file of the copy was modified in the same changeset\&. This flag makes the command inspect unmodified files as candidates for the source of copy\&. This is a very expensive operation for large projects, so use it with caution\&.
85 \-M and \-C options require O(n^2) processing time where n is the number of potential rename/copy targets\&. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number\&.
89 Look for differences that contain the change in <string>\&.
93 When \-S finds a change, show all the changes in that changeset, not just the files that contain the change in <string>\&.
97 Output the patch in the order specified in the <orderfile>, which has one shell glob pattern per line\&.
101 Swap two inputs; that is, show differences from index or on\-disk file to tree contents\&.
104 For more detailed explanation on these common options, see also diffcore documentation: \fIdiffcore.html\fR\&.
108 The stage number to be compared\&.
113 The output format from "git\-diff\-index", "git\-diff\-tree" and "git\-diff\-files" are very similar\&.
116 These commands all compare two sets of things; what is compared differs:
119 git\-diff\-index <tree\-ish>
120 compares the <tree\-ish> and the files on the filesystem\&.
123 git\-diff\-index \-\-cached <tree\-ish>
124 compares the <tree\-ish> and the index\&.
127 git\-diff\-tree [\-r] <tree\-ish\-1> <tree\-ish\-2> [<pattern>...]
128 compares the trees named by the two arguments\&.
131 git\-diff\-files [<pattern>...]
132 compares the index and the files on the filesystem\&.
135 An output line is formatted this way:
138 in\-place edit :100644 100644 bcd1234\&.\&.\&. 0123456\&.\&.\&. M file0
139 copy\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. C68 file1 file2
140 rename\-edit :100644 100644 abcd123\&.\&.\&. 1234567\&.\&.\&. R86 file1 file3
141 create :000000 100644 0000000\&.\&.\&. 1234567\&.\&.\&. A file4
142 delete :100644 000000 1234567\&.\&.\&. 0000000\&.\&.\&. D file5
143 unmerged :000000 000000 0000000\&.\&.\&. 0000000\&.\&.\&. U file6
147 That is, from the left to the right:
154 mode for "src"; 000000 if creation or unmerged\&.
160 mode for "dst"; 000000 if deletion or unmerged\&.
166 sha1 for "src"; 0{40} if creation or unmerged\&.
172 sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree"\&.
178 status, followed by optional "score" number\&.
181 a tab or a NUL when \fI\-z\fR option is used\&.
187 a tab or a NUL when \fI\-z\fR option is used; only exists for C or R\&.
190 path for "dst"; only exists for C or R\&.
193 an LF or a NUL when \fI\-z\fR option is used, to terminate the record\&.
197 <sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index\&.
203 :100644 100644 5be4a4\&.\&.\&.\&.\&.\&. 000000\&.\&.\&.\&.\&.\&. M file\&.c
207 When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
209 .SH "GENERATING PATCHES WITH -P"
212 When "git\-diff\-index", "git\-diff\-tree", or "git\-diff\-files" are run with a \fI\-p\fR option, they do not produce the output described above; instead they produce a patch file\&.
215 The patch generation can be customized at two levels\&.
219 When the environment variable \fIGIT_EXTERNAL_DIFF\fR is not set, these commands internally invoke "diff" like this:
223 diff \-L a/<path> \-L b/<path> \-pu <old> <new>
225 For added files, /dev/null is used for <old>\&. For removed files, /dev/null is used for <new>
227 The "diff" formatting options can be customized via the environment variable \fIGIT_DIFF_OPTS\fR\&. For example, if you prefer context diff:
230 GIT_DIFF_OPTS=\-c git\-diff\-index \-p HEAD
234 When the environment variable \fIGIT_EXTERNAL_DIFF\fR is set, the program named by it is called, instead of the diff invocation described above\&.
236 For a path that is added, removed, or modified, \fIGIT_EXTERNAL_DIFF\fR is called with 7 parameters:
240 path old\-file old\-hex old\-mode new\-file new\-hex new\-mode
246 are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,
250 are the 40\-hexdigit SHA1 hashes,
254 are the octal representation of the file modes\&.
256 The file parameters can point at the user's working file (e\&.g\&. new\-file in "git\-diff\-files"), /dev/null (e\&.g\&. old\-file when a new file is added), or a temporary file (e\&.g\&. old\-file in the index)\&. \fIGIT_EXTERNAL_DIFF\fR should not worry about unlinking the temporary file \-\-\- it is removed when \fIGIT_EXTERNAL_DIFF\fR exits\&.
260 For a path that is unmerged, \fIGIT_EXTERNAL_DIFF\fR is called with 1 parameter, <path>\&.
262 .SH "GIT SPECIFIC EXTENSION TO DIFF FORMAT"
265 What \-p option produces is slightly different from the traditional diff format\&.
269 It is preceded with a "git diff" header, that looks like this:
273 diff \-\-git a/file1 b/file2
275 The a/ and b/ filenames are the same unless rename/copy is involved\&. Especially, even for a creation or a deletion, /dev/null is _not_ used in place of a/ or b/ filenames\&.
277 When rename/copy is involved, file1 and file2 show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively\&.
280 It is followed by one or more extended header lines:
285 deleted file mode <mode>
291 similarity index <number>
292 dissimilarity index <number>
293 index <hash>\&.\&.<hash> <mode>
297 TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively\&.
300 .SH "COMBINED DIFF FORMAT"
303 git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this:
306 diff \-\-combined describe\&.c
308 return (a_date > b_date) ? \-1 : (a_date == b_date) ? 0 : 1;
311 \- static void describe(char *arg)
312 \-static void describe(struct commit *cmit, int last_one)
313 ++static void describe(char *arg, int last_one)
315 + unsigned char sha1[20];
316 + struct commit *cmit;
320 Unlike the traditional \fIunified\fR diff format, which shows two files A and B with a single column that has \- (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN\&. One column for each of fileN is prepended to the output line to note how X's line is different from it\&.
323 A \- character in the column N means that the line appears in fileN but it does not appear in the last file\&. A + character in the column N means that the line appears in the last file, and fileN does not have that line\&.
326 In the above example output, the function signature was changed from both files (hence two \- removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 nor file2)\&. Also two other lines are the same from file1 but do not appear in file2 (hence prefixed with +)\&.
329 When shown by git diff\-tree \-c, it compares the parents of a merge commit with the merge result (i\&.e\&. file1\&.\&.fileN are the parents)\&. When shown by git diff\-files \-c, it compares the two unresolved merge parents with the working tree file (i\&.e\&. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version")\&.
334 Written by Junio C Hamano <junkio@cox\&.net>
339 Documentation by Junio C Hamano\&.
344 Part of the \fBgit\fR(7) suite