| blob | 21d846700fb05cf77a59a294561294f34fb11ddc |
4 <head>
8 /* Debug borders */
10 /*
11 border: 1px solid red;
12 */
13 }
15 body {
17 }
19 a {
22 }
25 }
27 em {
29 }
31 strong {
33 }
35 tt {
37 }
45 }
49 }
50 h2 {
52 }
53 h3 {
55 }
56 h3 + * {
58 }
63 }
65 hr {
67 }
69 p {
72 }
74 pre {
77 }
79 span#author {
84 }
85 span#email {
86 }
87 span#revision {
89 }
91 div#footer {
97 }
98 div#footer-text {
101 }
102 div#footer-badges {
105 }
107 div#preamble,
114 }
118 }
122 }
124 /* Block element titles. */
131 }
134 }
138 }
141 }
144 }
150 }
154 }
159 }
163 }
167 }
170 }
179 }
183 }
188 }
192 }
198 dl {
201 }
202 dt {
206 }
209 }
213 }
216 }
220 }
221 thead {
224 }
225 tfoot {
227 }
232 }
235 }
240 }
243 }
247 }
249 div#toctitle {
256 }
261 }
265 }
269 }
273 }
275 /* Workarounds for IE6's broken and incomplete CSS2. */
281 }
287 }
293 }
297 }
302 }
304 /* IE6 sets dynamically generated links as visited. */
306 </style>
308 </head>
309 <body>
311 <h1>
312 git-diff(1) Manual Page
313 </h1>
316 <p>git-diff -
317 Show changes between commits, commit and working tree, etc
318 </p>
319 </div>
320 </div>
323 <div class="para"><p><em>git diff</em> [<common diff options>] <commit>{0,2} [--] [<path>…]</p></div>
324 </div>
328 tree and the index file, or the index file and the working tree.</p></div>
330 <dt>
332 </dt>
333 <dd>
334 <p>
335 This form is to view the changes you made relative to
336 the index (staging area for the next commit). In other
337 words, the differences are what you _could_ tell git to
338 further add to the index but you still haven't. You can
340 </p>
342 compare the two files / directories. This behavior can be
343 forced by --no-index.</p></div>
344 </dd>
345 <dt>
347 </dt>
348 <dd>
349 <p>
350 This form is to view the changes you staged for the next
352 would want comparison with the latest commit, so if you
354 --staged is a synonym of --cached.
355 </p>
356 </dd>
357 <dt>
359 </dt>
360 <dd>
361 <p>
362 This form is to view the changes you have in your
364 use HEAD to compare it with the latest commit, or a
365 branch name to compare with the tip of a different
366 branch.
367 </p>
368 </dd>
369 <dt>
371 </dt>
372 <dd>
373 <p>
374 This is to view the changes between two arbitrary
376 </p>
377 </dd>
378 <dt>
380 </dt>
381 <dd>
382 <p>
384 one side is omitted, it will have the same effect as
385 using HEAD instead.
386 </p>
387 </dd>
388 <dt>
390 </dt>
391 <dd>
392 <p>
393 This form is to view the changes on the branch containing
396 "git diff $(git-merge-base A B) B". You can omit any one
398 </p>
399 </dd>
400 </dl></div>
403 for the last two forms that use ".." notations, can be any
407 However, "diff" is about comparing two _endpoints_, not ranges,
408 and the range notations ("<commit>..<commit>" and
409 "<commit>...<commit>") do not mean a range as defined in the
411 </div>
415 <dt>
416 -p
417 </dt>
418 <dt>
419 -u
420 </dt>
421 <dd>
422 <p>
423 Generate patch (see section on generating patches).
424 This is the default.
425 </p>
426 </dd>
427 <dt>
429 </dt>
430 <dt>
432 </dt>
433 <dd>
434 <p>
436 the usual three. Implies "-p".
437 </p>
438 </dd>
439 <dt>
440 --raw
441 </dt>
442 <dd>
443 <p>
444 Generate the raw format.
446 </p>
447 </dd>
448 <dt>
449 --patch-with-raw
450 </dt>
451 <dd>
452 <p>
453 Synonym for "-p --raw".
454 </p>
455 </dd>
456 <dt>
457 --patience
458 </dt>
459 <dd>
460 <p>
461 Generate a diff using the "patience diff" algorithm.
462 </p>
463 </dd>
464 <dt>
465 --stat[=width[,name-width]]
466 </dt>
467 <dd>
468 <p>
469 Generate a diffstat. You can override the default
471 The width of the filename part can be controlled by
472 giving another width to it separated by a comma.
473 </p>
474 </dd>
475 <dt>
476 --numstat
477 </dt>
478 <dd>
479 <p>
480 Similar to --stat, but shows number of added and
481 deleted lines in decimal notation and pathname without
482 abbreviation, to make it more machine friendly. For
485 </p>
486 </dd>
487 <dt>
488 --shortstat
489 </dt>
490 <dd>
491 <p>
492 Output only the last line of the --stat format containing total
493 number of modified files, as well as number of added and deleted
494 lines.
495 </p>
496 </dd>
497 <dt>
498 --dirstat[=limit]
499 </dt>
500 <dd>
501 <p>
502 Output the distribution of relative amount of changes (number of lines added or
503 removed) for each sub-directory. Directories with changes below
504 a cut-off percent (3% by default) are not shown. The cut-off percent
505 can be set with "--dirstat=limit". Changes in a child directory is not
506 counted for the parent directory, unless "--cumulative" is used.
507 </p>
508 </dd>
509 <dt>
510 --dirstat-by-file[=limit]
511 </dt>
512 <dd>
513 <p>
514 Same as --dirstat, but counts changed files instead of lines.
515 </p>
516 </dd>
517 <dt>
518 --summary
519 </dt>
520 <dd>
521 <p>
522 Output a condensed summary of extended header information
523 such as creations, renames and mode changes.
524 </p>
525 </dd>
526 <dt>
527 --patch-with-stat
528 </dt>
529 <dd>
530 <p>
531 Synonym for "-p --stat".
533 </p>
534 </dd>
535 <dt>
536 -z
537 </dt>
538 <dd>
539 <p>
540 NUL-line termination on output. This affects the --raw
541 output field terminator. Also output from commands such
542 as "git-log" will be delimited with NUL between commits.
543 </p>
544 </dd>
545 <dt>
546 --name-only
547 </dt>
548 <dd>
549 <p>
550 Show only names of changed files.
551 </p>
552 </dd>
553 <dt>
554 --name-status
555 </dt>
556 <dd>
557 <p>
558 Show only names and status of changed files. See the description
560 </p>
561 </dd>
562 <dt>
563 --color
564 </dt>
565 <dd>
566 <p>
567 Show colored diff.
568 </p>
569 </dd>
570 <dt>
571 --no-color
572 </dt>
573 <dd>
574 <p>
575 Turn off colored diff, even when the configuration file
576 gives the default to color output.
577 </p>
578 </dd>
579 <dt>
581 </dt>
582 <dd>
583 <p>
584 Show colored word diff, i.e., color words which have changed.
585 By default, words are separated by whitespace.
586 </p>
589 considered whitespace and ignored(!) for the purposes of finding
591 expression to make sure that it matches all non-whitespace characters.
592 A match that contains a newline is silently truncated(!) at the
593 newline.</p></div>
595 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
596 overrides any diff driver or configuration setting. Diff drivers
597 override configuration settings.</p></div>
598 </dd>
599 <dt>
600 --no-renames
601 </dt>
602 <dd>
603 <p>
604 Turn off rename detection, even when the configuration
605 file gives the default to do so.
606 </p>
607 </dd>
608 <dt>
609 --check
610 </dt>
611 <dd>
612 <p>
613 Warn if changes introduce trailing whitespace
614 or an indent that uses a space before a tab. Exits with
615 non-zero status if problems are found. Not compatible with
616 --exit-code.
617 </p>
618 </dd>
619 <dt>
620 --full-index
621 </dt>
622 <dd>
623 <p>
624 Instead of the first handful of characters, show the full
625 pre- and post-image blob object names on the "index"
626 line when generating patch format output.
627 </p>
628 </dd>
629 <dt>
630 --binary
631 </dt>
632 <dd>
633 <p>
634 In addition to --full-index, output "binary diff" that
635 can be applied with "git apply".
636 </p>
637 </dd>
638 <dt>
640 </dt>
641 <dd>
642 <p>
643 Instead of showing the full 40-byte hexadecimal object
644 name in diff-raw format output and diff-tree header
645 lines, show only a partial prefix. This is
646 independent of --full-index option above, which controls
647 the diff-patch output format. Non default number of
649 </p>
650 </dd>
651 <dt>
652 -B
653 </dt>
654 <dd>
655 <p>
656 Break complete rewrite changes into pairs of delete and create.
657 </p>
658 </dd>
659 <dt>
660 -M
661 </dt>
662 <dd>
663 <p>
664 Detect renames.
665 </p>
666 </dd>
667 <dt>
668 -C
669 </dt>
670 <dd>
671 <p>
673 </p>
674 </dd>
675 <dt>
676 --diff-filter=[ACDMRTUXB*]
677 </dt>
678 <dd>
679 <p>
685 Any combination of the filter characters may be used.
687 paths are selected if there is any file that matches
688 other criteria in the comparison; if there is no file
689 that matches other criteria, nothing is selected.
690 </p>
691 </dd>
692 <dt>
693 --find-copies-harder
694 </dt>
695 <dd>
696 <p>
698 if the original file of the copy was modified in the same
699 changeset. This flag makes the command
700 inspect unmodified files as candidates for the source of
701 copy. This is a very expensive operation for large
702 projects, so use it with caution. Giving more than one
704 </p>
705 </dd>
706 <dt>
708 </dt>
709 <dd>
710 <p>
711 -M and -C options require O(n^2) processing time where n
712 is the number of potential rename/copy targets. This
713 option prevents rename/copy detection from running if
714 the number of rename/copy targets exceeds the specified
715 number.
716 </p>
717 </dd>
718 <dt>
720 </dt>
721 <dd>
722 <p>
723 Look for differences that introduce or remove an instance of
727 </p>
728 </dd>
729 <dt>
730 --pickaxe-all
731 </dt>
732 <dd>
733 <p>
734 When -S finds a change, show all the changes in that
735 changeset, not just the files that contain the change
737 </p>
738 </dd>
739 <dt>
740 --pickaxe-regex
741 </dt>
742 <dd>
743 <p>
745 regex to match.
746 </p>
747 </dd>
748 <dt>
750 </dt>
751 <dd>
752 <p>
753 Output the patch in the order specified in the
755 </p>
756 </dd>
757 <dt>
758 -R
759 </dt>
760 <dd>
761 <p>
762 Swap two inputs; that is, show differences from index or
763 on-disk file to tree contents.
764 </p>
765 </dd>
766 <dt>
768 </dt>
769 <dd>
770 <p>
771 When run from a subdirectory of the project, it can be
772 told to exclude changes outside the directory and show
773 pathnames relative to it with this option. When you are
774 not in a subdirectory (e.g. in a bare repository), you
775 can name which subdirectory to make the output relative
777 </p>
778 </dd>
779 <dt>
780 -a
781 </dt>
782 <dt>
783 --text
784 </dt>
785 <dd>
786 <p>
787 Treat all files as text.
788 </p>
789 </dd>
790 <dt>
791 --ignore-space-at-eol
792 </dt>
793 <dd>
794 <p>
795 Ignore changes in whitespace at EOL.
796 </p>
797 </dd>
798 <dt>
799 -b
800 </dt>
801 <dt>
802 --ignore-space-change
803 </dt>
804 <dd>
805 <p>
806 Ignore changes in amount of whitespace. This ignores whitespace
807 at line end, and considers all other sequences of one or
808 more whitespace characters to be equivalent.
809 </p>
810 </dd>
811 <dt>
812 -w
813 </dt>
814 <dt>
815 --ignore-all-space
816 </dt>
817 <dd>
818 <p>
819 Ignore whitespace when comparing lines. This ignores
820 differences even if one line has whitespace where the other
821 line has none.
822 </p>
823 </dd>
824 <dt>
826 </dt>
827 <dd>
828 <p>
829 Show the context between diff hunks, up to the specified number
830 of lines, thereby fusing hunks that are close to each other.
831 </p>
832 </dd>
833 <dt>
834 --exit-code
835 </dt>
836 <dd>
837 <p>
838 Make the program exit with codes similar to diff(1).
839 That is, it exits with 1 if there were differences and
840 0 means no differences.
841 </p>
842 </dd>
843 <dt>
844 --quiet
845 </dt>
846 <dd>
847 <p>
848 Disable all output of the program. Implies --exit-code.
849 </p>
850 </dd>
851 <dt>
852 --ext-diff
853 </dt>
854 <dd>
855 <p>
856 Allow an external diff helper to be executed. If you set an
859 </p>
860 </dd>
861 <dt>
862 --no-ext-diff
863 </dt>
864 <dd>
865 <p>
866 Disallow external diff drivers.
867 </p>
868 </dd>
869 <dt>
870 --ignore-submodules
871 </dt>
872 <dd>
873 <p>
874 Ignore changes to submodules in the diff generation.
875 </p>
876 </dd>
877 <dt>
879 </dt>
880 <dd>
881 <p>
882 Show the given source prefix instead of "a/".
883 </p>
884 </dd>
885 <dt>
887 </dt>
888 <dd>
889 <p>
890 Show the given destination prefix instead of "b/".
891 </p>
892 </dd>
893 <dt>
894 --no-prefix
895 </dt>
896 <dd>
897 <p>
898 Do not show any source or destination prefix.
899 </p>
900 </dd>
901 </dl></div>
905 <dt>
907 </dt>
908 <dd>
909 <p>
911 the diff to the named paths (you can give directory
912 names and get diff for all files under them).
913 </p>
914 </dd>
915 </dl></div>
916 </div>
922 compared differs:</p></div>
924 <dt>
926 </dt>
927 <dd>
928 <p>
930 </p>
931 </dd>
932 <dt>
934 </dt>
935 <dd>
936 <p>
938 </p>
939 </dd>
940 <dt>
942 </dt>
943 <dd>
944 <p>
945 compares the trees named by the two arguments.
946 </p>
947 </dd>
948 <dt>
950 </dt>
951 <dd>
952 <p>
953 compares the index and the files on the filesystem.
954 </p>
955 </dd>
956 </dl></div>
966 </div></div>
969 <li>
970 <p>
971 a colon.
972 </p>
973 </li>
974 <li>
975 <p>
977 </p>
978 </li>
979 <li>
980 <p>
981 a space.
982 </p>
983 </li>
984 <li>
985 <p>
987 </p>
988 </li>
989 <li>
990 <p>
991 a space.
992 </p>
993 </li>
994 <li>
995 <p>
997 </p>
998 </li>
999 <li>
1000 <p>
1001 a space.
1002 </p>
1003 </li>
1004 <li>
1005 <p>
1007 </p>
1008 </li>
1009 <li>
1010 <p>
1011 a space.
1012 </p>
1013 </li>
1014 <li>
1015 <p>
1016 status, followed by optional "score" number.
1017 </p>
1018 </li>
1019 <li>
1020 <p>
1022 </p>
1023 </li>
1024 <li>
1025 <p>
1026 path for "src"
1027 </p>
1028 </li>
1029 <li>
1030 <p>
1032 </p>
1033 </li>
1034 <li>
1035 <p>
1036 path for "dst"; only exists for C or R.
1037 </p>
1038 </li>
1039 <li>
1040 <p>
1042 </p>
1043 </li>
1044 </ol></div>
1047 <li>
1048 <p>
1049 A: addition of a file
1050 </p>
1051 </li>
1052 <li>
1053 <p>
1054 C: copy of a file into a new one
1055 </p>
1056 </li>
1057 <li>
1058 <p>
1059 D: deletion of a file
1060 </p>
1061 </li>
1062 <li>
1063 <p>
1064 M: modification of the contents or mode of a file
1065 </p>
1066 </li>
1067 <li>
1068 <p>
1069 R: renaming of a file
1070 </p>
1071 </li>
1072 <li>
1073 <p>
1074 T: change in the type of the file
1075 </p>
1076 </li>
1077 <li>
1078 <p>
1079 U: file is unmerged (you must complete the merge before it can
1080 be committed)
1081 </p>
1082 </li>
1083 <li>
1084 <p>
1085 X: "unknown" change type (most probably a bug, please report it)
1086 </p>
1087 </li>
1088 </ul></div>
1090 percentage of similarity between the source and target of the move or
1091 copy), and are the only ones to be so.</p></div>
1093 and it is out of sync with the index.</p></div>
1098 </div></div>
1101 respectively.</p></div>
1102 </div>
1107 to generate diff output also for merge commits. The output differs
1108 from the format described above in the following way:</p></div>
1110 <li>
1111 <p>
1112 there is a colon for each parent
1113 </p>
1114 </li>
1115 <li>
1116 <p>
1118 </p>
1119 </li>
1120 <li>
1121 <p>
1122 status is concatenated status characters for each parent
1123 </p>
1124 </li>
1125 <li>
1126 <p>
1127 no optional "score" number
1128 </p>
1129 </li>
1130 <li>
1131 <p>
1132 single path, only for "dst"
1133 </p>
1134 </li>
1135 </ol></div>
1140 </div></div>
1141 <div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from
1142 all parents.</p></div>
1143 </div>
1149 do not produce the output described above; instead they produce a
1150 patch file. You can customize the creation of such patches via the
1151 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1153 diff format.</p></div>
1155 <li>
1156 <p>
1157 It is preceded with a "git diff" header, that looks like
1158 this:
1159 </p>
1163 </div></div>
1164 <div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1165 involved. Especially, even for a creation or a deletion,
1168 name of the source file of the rename/copy and the name of
1169 the file that rename/copy produces, respectively.</p></div>
1170 </li>
1171 <li>
1172 <p>
1173 It is followed by one or more extended header lines:
1174 </p>
1188 </div></div>
1189 </li>
1190 <li>
1191 <p>
1192 TAB, LF, double quote and backslash characters in pathnames
1194 If there is need for such substitution then the whole
1195 pathname is put in double quotes.
1196 </p>
1197 </li>
1198 </ol></div>
1200 the dissimilarity index is the percentage of changed lines. It
1201 is a rounded down integer, followed by a percent sign. The
1202 similarity index value of 100% is thus reserved for two equal
1203 files, while 100% dissimilarity means that no line from the old
1204 file made it into the new one.</p></div>
1205 </div>
1209 <em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit
1211 A <em>combined diff</em> format looks like this:</p></div>
1214 <pre><tt>diff --combined describe.c
1215 index fabadb8,cc95eb0..4866510
1216 --- a/describe.c
1217 +++ b/describe.c
1218 @@@ -98,20 -98,12 +98,20 @@@
1219 return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
1220 }
1222 - static void describe(char *arg)
1223 -static void describe(struct commit *cmit, int last_one)
1224 ++static void describe(char *arg, int last_one)
1225 {
1226 + unsigned char sha1[20];
1227 + struct commit *cmit;
1228 struct commit_list *list;
1229 static int initialized = 0;
1230 struct commit_name *n;
1232 + if (get_sha1(arg, sha1) < 0)
1233 + usage(describe_usage);
1234 + cmit = lookup_commit_reference(sha1);
1235 + if (!cmit)
1236 + usage(describe_usage);
1237 +
1238 if (!initialized) {
1239 initialized = 1;
1240 for_each_ref(get_name);</tt></pre>
1241 </div></div>
1243 <li>
1244 <p>
1246 this (when <em>-c</em> option is used):
1247 </p>
1250 <pre><tt>diff --combined file</tt></pre>
1251 </div></div>
1255 <pre><tt>diff --cc file</tt></pre>
1256 </div></div>
1257 </li>
1258 <li>
1259 <p>
1260 It is followed by one or more extended header lines
1261 (this example shows a merge with two parents):
1262 </p>
1265 <pre><tt>index <hash>,<hash>..<hash>
1266 mode <mode>,<mode>..<mode>
1267 new file mode <mode>
1268 deleted file mode <mode>,<mode></tt></pre>
1269 </div></div>
1270 <div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1271 the <mode> is different from the rest. Extended headers with
1272 information about detected contents movement (renames and
1273 copying detection) are designed to work with diff of two
1274 <tree-ish> and are not used by combined diff format.</p></div>
1275 </li>
1276 <li>
1277 <p>
1278 It is followed by two-line from-file/to-file header
1279 </p>
1282 <pre><tt>--- a/file
1283 +++ b/file</tt></pre>
1284 </div></div>
1286 format, <tt>/dev/null</tt> is used to signal created or deleted
1287 files.</p></div>
1288 </li>
1289 <li>
1290 <p>
1291 Chunk header format is modified to prevent people from
1292 accidentally feeding it to <tt>patch -p1</tt>. Combined diff format
1293 was created for review of merge commit changes, and was not
1294 meant for apply. The change is similar to the change in the
1295 extended <em>index</em> header:
1296 </p>
1299 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1300 </div></div>
1302 header for combined diff format.</p></div>
1303 </li>
1304 </ol></div>
1306 files A and B with a single column that has <tt>-</tt> (minus —
1307 appears in A but removed in B), <tt>+</tt> (plus — missing in A but
1309 compares two or more files file1, file2,… with one file X, and
1310 shows how X differs from each of fileN. One column for each of
1311 fileN is prepended to the output line to note how X's line is
1312 different from it.</p></div>
1314 fileN but it does not appear in the result. A <tt>+</tt> character
1315 in the column N means that the line appears in the result,
1316 and fileN does not have that line (in other words, the line was
1317 added, from the point of view of that parent).</p></div>
1319 from both files (hence two <tt>-</tt> removals from both file1 and
1320 file2, plus <tt>++</tt> to mean one line that was added does not appear
1321 in either file1 nor file2). Also eight other lines are the same
1322 from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
1324 merge commit with the merge result (i.e. file1..fileN are the
1325 parents). When shown by <tt>git diff-files -c</tt>, it compares the
1326 two unresolved merge parents with the working tree file
1329 </div>
1333 copied files. The <tt>--stat</tt> option adds diffstat(1) graph to the
1334 output. These options can be combined with other options, such as
1335 <tt>-p</tt>, and are meant for human consumption.</p></div>
1336 <div class="para"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1337 formats the pathnames compactly by combining common prefix and suffix of
1338 the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to
1339 <tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p></div>
1342 <pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre>
1343 </div></div>
1344 <div class="para"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1345 for easier machine consumption. An entry in <tt>--numstat</tt> output looks
1346 like this:</p></div>
1349 <pre><tt>1 2 README
1350 3 1 arch/{i386 => x86}/Makefile</tt></pre>
1351 </div></div>
1354 <li>
1355 <p>
1356 the number of added lines;
1357 </p>
1358 </li>
1359 <li>
1360 <p>
1361 a tab;
1362 </p>
1363 </li>
1364 <li>
1365 <p>
1366 the number of deleted lines;
1367 </p>
1368 </li>
1369 <li>
1370 <p>
1371 a tab;
1372 </p>
1373 </li>
1374 <li>
1375 <p>
1376 pathname (possibly with rename/copy information);
1377 </p>
1378 </li>
1379 <li>
1380 <p>
1381 a newline.
1382 </p>
1383 </li>
1384 </ol></div>
1385 <div class="para"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1388 <pre><tt>1 2 README NUL
1389 3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre>
1390 </div></div>
1393 <li>
1394 <p>
1395 the number of added lines;
1396 </p>
1397 </li>
1398 <li>
1399 <p>
1400 a tab;
1401 </p>
1402 </li>
1403 <li>
1404 <p>
1405 the number of deleted lines;
1406 </p>
1407 </li>
1408 <li>
1409 <p>
1410 a tab;
1411 </p>
1412 </li>
1413 <li>
1414 <p>
1415 a NUL (only exists if renamed/copied);
1416 </p>
1417 </li>
1418 <li>
1419 <p>
1420 pathname in preimage;
1421 </p>
1422 </li>
1423 <li>
1424 <p>
1425 a NUL (only exists if renamed/copied);
1426 </p>
1427 </li>
1428 <li>
1429 <p>
1430 pathname in postimage (only exists if renamed/copied);
1431 </p>
1432 </li>
1433 <li>
1434 <p>
1435 a NUL.
1436 </p>
1437 </li>
1438 </ol></div>
1439 <div class="para"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1440 scripts that read the output to tell if the current record being read is
1441 a single-path record or a rename/copy record without reading ahead.
1442 After reading added and deleted lines, reading up to <tt>NUL</tt> would yield
1443 the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></div>
1444 </div>
1448 <dt>
1449 Various ways to check your working tree
1450 </dt>
1451 <dd>
1454 <pre><tt>$ git diff <b>(1)</b>
1455 $ git diff --cached <b>(2)</b>
1456 $ git diff HEAD <b>(3)</b></tt></pre>
1457 </div></div>
1459 <li>
1460 <p>
1461 Changes in the working tree not yet staged for the next commit.
1462 </p>
1463 </li>
1464 <li>
1465 <p>
1466 Changes between the index and your last commit; what you
1468 </p>
1469 </li>
1470 <li>
1471 <p>
1472 Changes in the working tree since your last commit; what you
1474 </p>
1475 </li>
1476 </ol></div>
1477 </dd>
1478 <dt>
1479 Comparing with arbitrary commits
1480 </dt>
1481 <dd>
1484 <pre><tt>$ git diff test <b>(1)</b>
1485 $ git diff HEAD -- ./test <b>(2)</b>
1486 $ git diff HEAD^ HEAD <b>(3)</b></tt></pre>
1487 </div></div>
1489 <li>
1490 <p>
1491 Instead of using the tip of the current branch, compare with the
1493 </p>
1494 </li>
1495 <li>
1496 <p>
1498 the tip of the current branch, but limit the comparison to the
1500 </p>
1501 </li>
1502 <li>
1503 <p>
1504 Compare the version before the last commit and the last commit.
1505 </p>
1506 </li>
1507 </ol></div>
1508 </dd>
1509 <dt>
1510 Comparing branches
1511 </dt>
1512 <dd>
1515 <pre><tt>$ git diff topic master <b>(1)</b>
1516 $ git diff topic..master <b>(2)</b>
1517 $ git diff topic...master <b>(3)</b></tt></pre>
1518 </div></div>
1520 <li>
1521 <p>
1522 Changes between the tips of the topic and the master branches.
1523 </p>
1524 </li>
1525 <li>
1526 <p>
1527 Same as above.
1528 </p>
1529 </li>
1530 <li>
1531 <p>
1532 Changes that occurred on the master branch since when the topic
1533 branch was started off it.
1534 </p>
1535 </li>
1536 </ol></div>
1537 </dd>
1538 <dt>
1539 Limiting the diff output
1540 </dt>
1541 <dd>
1544 <pre><tt>$ git diff --diff-filter=MRC <b>(1)</b>
1545 $ git diff --name-status <b>(2)</b>
1546 $ git diff arch/i386 include/asm-i386 <b>(3)</b></tt></pre>
1547 </div></div>
1549 <li>
1550 <p>
1551 Show only modification, rename and copy, but not addition
1552 nor deletion.
1553 </p>
1554 </li>
1555 <li>
1556 <p>
1557 Show only names and the nature of change, but not actual
1558 diff output.
1559 </p>
1560 </li>
1561 <li>
1562 <p>
1563 Limit diff output to named subtrees.
1564 </p>
1565 </li>
1566 </ol></div>
1567 </dd>
1568 <dt>
1569 Munging the diff output
1570 </dt>
1571 <dd>
1574 <pre><tt>$ git diff --find-copies-harder -B -C <b>(1)</b>
1575 $ git diff -R <b>(2)</b></tt></pre>
1576 </div></div>
1578 <li>
1579 <p>
1580 Spend extra cycles to find renames, copies and complete
1581 rewrites (very expensive).
1582 </p>
1583 </li>
1584 <li>
1585 <p>
1586 Output diff in reverse.
1587 </p>
1588 </li>
1589 </ol></div>
1590 </dd>
1591 </dl></div>
1592 </div>
1596 </div>
1599 <div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
1600 </div>
1604 </div>
1607 Last updated 2009-04-02 06:49:50 UTC
1608 </div>
1609 </div>
1610 </body>
1611 </html>