| blob | 36e6b92306e07bc6bfcc5ed21dfb73da9698c683 |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-diff(1) Manual Page
407 </h1>
410 <p>git-diff -
411 Show changes between commits, commit and working tree, etc
412 </p>
413 </div>
414 </div>
418 <div class="verseblock-content"><em>git diff</em> [options] [<commit>] [--] [<path>…]
423 </div></div>
424 </div>
427 <div class="paragraph"><p>Show changes between the working tree and the index or a tree, changes
428 between the index and a tree, changes between two trees, or changes
429 between two files on disk.</p></div>
433 </dt>
434 <dd>
435 <p>
436 This form is to view the changes you made relative to
437 the index (staging area for the next commit). In other
439 further add to the index but you still haven’t. You can
441 </p>
444 directories. This behavior can be forced by --no-index.</p></div>
445 </dd>
448 </dt>
449 <dd>
450 <p>
451 This form is to view the changes you staged for the next
453 would want comparison with the latest commit, so if you
455 If HEAD does not exist (e.g. unborned branches) and
457 --staged is a synonym of --cached.
458 </p>
459 </dd>
462 </dt>
463 <dd>
464 <p>
465 This form is to view the changes you have in your
467 use HEAD to compare it with the latest commit, or a
468 branch name to compare with the tip of a different
469 branch.
470 </p>
471 </dd>
474 </dt>
475 <dd>
476 <p>
477 This is to view the changes between two arbitrary
479 </p>
480 </dd>
483 </dt>
484 <dd>
485 <p>
487 one side is omitted, it will have the same effect as
488 using HEAD instead.
489 </p>
490 </dd>
493 </dt>
494 <dd>
495 <p>
496 This form is to view the changes on the branch containing
499 "git diff $(git-merge-base A B) B". You can omit any one
501 </p>
502 </dd>
503 </dl></div>
506 in the last two forms that use ".." notations, can be any
512 and the range notations ("<commit>..<commit>" and
513 "<commit>...<commit>") do not mean a range as defined in the
515 </div>
520 -p
521 </dt>
523 -u
524 </dt>
526 --patch
527 </dt>
528 <dd>
529 <p>
530 Generate patch (see section on generating patches).
531 This is the default.
532 </p>
533 </dd>
536 </dt>
539 </dt>
540 <dd>
541 <p>
543 the usual three.
545 </p>
546 </dd>
548 --raw
549 </dt>
550 <dd>
551 <p>
552 Generate the raw format.
554 </p>
555 </dd>
557 --patch-with-raw
558 </dt>
559 <dd>
560 <p>
562 </p>
563 </dd>
565 --patience
566 </dt>
567 <dd>
568 <p>
569 Generate a diff using the "patience diff" algorithm.
570 </p>
571 </dd>
574 </dt>
575 <dd>
576 <p>
577 Generate a diffstat. You can override the default
579 The width of the filename part can be controlled by
580 giving another width to it separated by a comma.
581 </p>
582 </dd>
584 --numstat
585 </dt>
586 <dd>
587 <p>
589 deleted lines in decimal notation and pathname without
590 abbreviation, to make it more machine friendly. For
593 </p>
594 </dd>
596 --shortstat
597 </dt>
598 <dd>
599 <p>
601 number of modified files, as well as number of added and deleted
602 lines.
603 </p>
604 </dd>
607 </dt>
608 <dd>
609 <p>
610 Output the distribution of relative amount of changes (number of lines added or
611 removed) for each sub-directory. Directories with changes below
612 a cut-off percent (3% by default) are not shown. The cut-off percent
615 </p>
616 <div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring
617 the amount of pure code movements within a file. In other words,
618 rearranging lines in a file is not counted as much as other changes.</p></div>
619 </dd>
622 </dt>
623 <dd>
624 <p>
626 </p>
627 </dd>
629 --summary
630 </dt>
631 <dd>
632 <p>
633 Output a condensed summary of extended header information
634 such as creations, renames and mode changes.
635 </p>
636 </dd>
638 --patch-with-stat
639 </dt>
640 <dd>
641 <p>
643 </p>
644 </dd>
646 -z
647 </dt>
648 <dd>
649 <p>
650 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
651 given, do not munge pathnames and use NULs as output field terminators.
652 </p>
653 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
655 respectively, and the pathname will be enclosed in double quotes if
656 any of those replacements occurred.</p></div>
657 </dd>
659 --name-only
660 </dt>
661 <dd>
662 <p>
663 Show only names of changed files.
664 </p>
665 </dd>
667 --name-status
668 </dt>
669 <dd>
670 <p>
671 Show only names and status of changed files. See the description
672 of the <tt>--diff-filter</tt> option on what the status letters mean.
673 </p>
674 </dd>
676 --submodule[=<format>]
677 </dt>
678 <dd>
679 <p>
680 Chose the output format for submodule differences. <format> can be one of
681 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
682 is used when this option is not given. <em>log</em> is the default value for this
683 option and lists the commits in that commit range like the <em>summary</em>
685 </p>
686 </dd>
688 --color[=<when>]
689 </dt>
690 <dd>
691 <p>
692 Show colored diff.
693 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
694 The default value is <tt>never</tt>.
695 It can be changed by the <tt>color.ui</tt> and <tt>color.diff</tt>
696 configuration settings.
697 </p>
698 </dd>
700 --no-color
701 </dt>
702 <dd>
703 <p>
704 Turn off colored diff.
705 This can be used to override configuration settings.
706 It is the same as <tt>--color=never</tt>.
707 </p>
708 </dd>
710 --word-diff[=<mode>]
711 </dt>
712 <dd>
713 <p>
714 Show a word diff, using the <mode> to delimit changed words.
715 By default, words are delimited by whitespace; see
716 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
717 must be one of:
718 </p>
721 color
722 </dt>
723 <dd>
724 <p>
725 Highlight changed words using only colors. Implies <tt>--color</tt>.
726 </p>
727 </dd>
729 plain
730 </dt>
731 <dd>
732 <p>
733 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
734 attempts to escape the delimiters if they appear in the input,
735 so the output may be ambiguous.
736 </p>
737 </dd>
739 porcelain
740 </dt>
741 <dd>
742 <p>
743 Use a special line-based format intended for script
744 consumption. Added/removed/unchanged runs are printed in the
745 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
746 character at the beginning of the line and extending to the
747 end of the line. Newlines in the input are represented by a
748 tilde <tt>~</tt> on a line of its own.
749 </p>
750 </dd>
752 none
753 </dt>
754 <dd>
755 <p>
756 Disable word diff again.
757 </p>
758 </dd>
759 </dl></div>
761 highlight the changed parts in all modes if enabled.</p></div>
762 </dd>
764 --word-diff-regex=<regex>
765 </dt>
766 <dd>
767 <p>
768 Use <regex> to decide what a word is, instead of considering
769 runs of non-whitespace to be a word. Also implies
770 <tt>--word-diff</tt> unless it was already enabled.
771 </p>
773 <regex> is considered a word. Anything between these matches is
774 considered whitespace and ignored(!) for the purposes of finding
775 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
776 expression to make sure that it matches all non-whitespace characters.
777 A match that contains a newline is silently truncated(!) at the
778 newline.</p></div>
779 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
780 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
781 overrides any diff driver or configuration setting. Diff drivers
782 override configuration settings.</p></div>
783 </dd>
785 --color-words[=<regex>]
786 </dt>
787 <dd>
788 <p>
789 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
790 specified) <tt>--word-diff-regex=<regex></tt>.
791 </p>
792 </dd>
794 --no-renames
795 </dt>
796 <dd>
797 <p>
798 Turn off rename detection, even when the configuration
799 file gives the default to do so.
800 </p>
801 </dd>
803 --check
804 </dt>
805 <dd>
806 <p>
807 Warn if changes introduce trailing whitespace
808 or an indent that uses a space before a tab. Exits with
809 non-zero status if problems are found. Not compatible with
810 --exit-code.
811 </p>
812 </dd>
814 --full-index
815 </dt>
816 <dd>
817 <p>
818 Instead of the first handful of characters, show the full
820 line when generating patch format output.
821 </p>
822 </dd>
824 --binary
825 </dt>
826 <dd>
827 <p>
828 In addition to <tt>--full-index</tt>, output a binary diff that
829 can be applied with <tt>git-apply</tt>.
830 </p>
831 </dd>
833 --abbrev[=<n>]
834 </dt>
835 <dd>
836 <p>
837 Instead of showing the full 40-byte hexadecimal object
838 name in diff-raw format output and diff-tree header
839 lines, show only a partial prefix. This is
840 independent of the <tt>--full-index</tt> option above, which controls
841 the diff-patch output format. Non default number of
842 digits can be specified with <tt>--abbrev=<n></tt>.
843 </p>
844 </dd>
846 -B[<n>][/<m>]
847 </dt>
849 --break-rewrites[=[<n>][/<m>]]
850 </dt>
851 <dd>
852 <p>
853 Break complete rewrite changes into pairs of delete and
854 create. This serves two purposes:
855 </p>
857 not as a series of deletion and insertion mixed together with a very
858 few lines that happen to match textually as the context, but as a
859 single deletion of everything old followed by a single insertion of
860 everything new, and the number <tt>m</tt> controls this aspect of the -B
861 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
862 original should remain in the result for git to consider it a total
863 rewrite (i.e. otherwise the resulting patch will be a series of
864 deletion and insertion mixed together with context lines).</p></div>
866 source of a rename (usually -M only considers a file that disappeared
867 as the source of a rename), and the number <tt>n</tt> controls this aspect of
868 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
869 addition and deletion compared to 20% or more of the file’s size are
870 eligible for being picked up as a possible source of a rename to
871 another file.</p></div>
872 </dd>
874 -M[<n>]
875 </dt>
877 --find-renames[=<n>]
878 </dt>
879 <dd>
880 <p>
881 Detect renames.
882 If <tt>n</tt> is specified, it is a threshold on the similarity
883 index (i.e. amount of addition/deletions compared to the
884 file’s size). For example, <tt>-M90%</tt> means git should consider a
885 delete/add pair to be a rename if more than 90% of the file
886 hasn’t changed.
887 </p>
888 </dd>
890 -C[<n>]
891 </dt>
893 --find-copies[=<n>]
894 </dt>
895 <dd>
896 <p>
897 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
898 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
899 </p>
900 </dd>
902 --find-copies-harder
903 </dt>
904 <dd>
905 <p>
906 For performance reasons, by default, <tt>-C</tt> option finds copies only
907 if the original file of the copy was modified in the same
908 changeset. This flag makes the command
909 inspect unmodified files as candidates for the source of
910 copy. This is a very expensive operation for large
911 projects, so use it with caution. Giving more than one
912 <tt>-C</tt> option has the same effect.
913 </p>
914 </dd>
916 -D
917 </dt>
919 --irreversible-delete
920 </dt>
921 <dd>
922 <p>
923 Omit the preimage for deletes, i.e. print only the header but not
924 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
925 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
926 solely for people who want to just concentrate on reviewing the
927 text after the change. In addition, the output obviously lack
928 enough information to apply such a patch in reverse, even manually,
929 hence the name of the option.
930 </p>
931 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
932 of a delete/create pair.</p></div>
933 </dd>
935 -l<num>
936 </dt>
937 <dd>
938 <p>
939 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
940 is the number of potential rename/copy targets. This
941 option prevents rename/copy detection from running if
942 the number of rename/copy targets exceeds the specified
943 number.
944 </p>
945 </dd>
947 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
948 </dt>
949 <dd>
950 <p>
951 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
952 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
953 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
954 are Unmerged (<tt>U</tt>), are
955 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
956 Any combination of the filter characters (including none) can be used.
957 When <tt>*</tt> (All-or-none) is added to the combination, all
958 paths are selected if there is any file that matches
959 other criteria in the comparison; if there is no file
960 that matches other criteria, nothing is selected.
961 </p>
962 </dd>
964 -S<string>
965 </dt>
966 <dd>
967 <p>
968 Look for differences that introduce or remove an instance of
969 <string>. Note that this is different than the string simply
970 appearing in diff output; see the <em>pickaxe</em> entry in
972 </p>
973 </dd>
975 -G<regex>
976 </dt>
977 <dd>
978 <p>
979 Look for differences whose added or removed line matches
980 the given <regex>.
981 </p>
982 </dd>
984 --pickaxe-all
985 </dt>
986 <dd>
987 <p>
988 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
989 changeset, not just the files that contain the change
990 in <string>.
991 </p>
992 </dd>
994 --pickaxe-regex
995 </dt>
996 <dd>
997 <p>
998 Make the <string> not a plain string but an extended POSIX
999 regex to match.
1000 </p>
1001 </dd>
1003 -O<orderfile>
1004 </dt>
1005 <dd>
1006 <p>
1007 Output the patch in the order specified in the
1008 <orderfile>, which has one shell glob pattern per line.
1009 </p>
1010 </dd>
1012 -R
1013 </dt>
1014 <dd>
1015 <p>
1016 Swap two inputs; that is, show differences from index or
1017 on-disk file to tree contents.
1018 </p>
1019 </dd>
1021 --relative[=<path>]
1022 </dt>
1023 <dd>
1024 <p>
1025 When run from a subdirectory of the project, it can be
1026 told to exclude changes outside the directory and show
1027 pathnames relative to it with this option. When you are
1028 not in a subdirectory (e.g. in a bare repository), you
1029 can name which subdirectory to make the output relative
1030 to by giving a <path> as an argument.
1031 </p>
1032 </dd>
1034 -a
1035 </dt>
1037 --text
1038 </dt>
1039 <dd>
1040 <p>
1041 Treat all files as text.
1042 </p>
1043 </dd>
1045 --ignore-space-at-eol
1046 </dt>
1047 <dd>
1048 <p>
1049 Ignore changes in whitespace at EOL.
1050 </p>
1051 </dd>
1053 -b
1054 </dt>
1056 --ignore-space-change
1057 </dt>
1058 <dd>
1059 <p>
1060 Ignore changes in amount of whitespace. This ignores whitespace
1061 at line end, and considers all other sequences of one or
1062 more whitespace characters to be equivalent.
1063 </p>
1064 </dd>
1066 -w
1067 </dt>
1069 --ignore-all-space
1070 </dt>
1071 <dd>
1072 <p>
1073 Ignore whitespace when comparing lines. This ignores
1074 differences even if one line has whitespace where the other
1075 line has none.
1076 </p>
1077 </dd>
1079 --inter-hunk-context=<lines>
1080 </dt>
1081 <dd>
1082 <p>
1083 Show the context between diff hunks, up to the specified number
1084 of lines, thereby fusing hunks that are close to each other.
1085 </p>
1086 </dd>
1088 --exit-code
1089 </dt>
1090 <dd>
1091 <p>
1092 Make the program exit with codes similar to diff(1).
1093 That is, it exits with 1 if there were differences and
1094 0 means no differences.
1095 </p>
1096 </dd>
1098 --quiet
1099 </dt>
1100 <dd>
1101 <p>
1102 Disable all output of the program. Implies <tt>--exit-code</tt>.
1103 </p>
1104 </dd>
1106 --ext-diff
1107 </dt>
1108 <dd>
1109 <p>
1110 Allow an external diff helper to be executed. If you set an
1113 </p>
1114 </dd>
1116 --no-ext-diff
1117 </dt>
1118 <dd>
1119 <p>
1120 Disallow external diff drivers.
1121 </p>
1122 </dd>
1124 --ignore-submodules[=<when>]
1125 </dt>
1126 <dd>
1127 <p>
1128 Ignore changes to submodules in the diff generation. <when> can be
1131 untracked or modified files or its HEAD differs from the commit recorded
1132 in the superproject and can be used to override any settings of the
1133 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1135 contain untracked content (but they are still scanned for modified
1137 only changes to the commits stored in the superproject are shown (this was
1139 </p>
1140 </dd>
1142 --src-prefix=<prefix>
1143 </dt>
1144 <dd>
1145 <p>
1147 </p>
1148 </dd>
1150 --dst-prefix=<prefix>
1151 </dt>
1152 <dd>
1153 <p>
1155 </p>
1156 </dd>
1158 --no-prefix
1159 </dt>
1160 <dd>
1161 <p>
1162 Do not show any source or destination prefix.
1163 </p>
1164 </dd>
1165 </dl></div>
1170 <path>…
1171 </dt>
1172 <dd>
1173 <p>
1174 The <paths> parameters, when given, are used to limit
1175 the diff to the named paths (you can give directory
1176 names and get diff for all files under them).
1177 </p>
1178 </dd>
1179 </dl></div>
1180 </div>
1186 compared differs:</p></div>
1189 git-diff-index <tree-ish>
1190 </dt>
1191 <dd>
1192 <p>
1193 compares the <tree-ish> and the files on the filesystem.
1194 </p>
1195 </dd>
1197 git-diff-index --cached <tree-ish>
1198 </dt>
1199 <dd>
1200 <p>
1201 compares the <tree-ish> and the index.
1202 </p>
1203 </dd>
1205 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1206 </dt>
1207 <dd>
1208 <p>
1209 compares the trees named by the two arguments.
1210 </p>
1211 </dd>
1213 git-diff-files [<pattern>…]
1214 </dt>
1215 <dd>
1216 <p>
1217 compares the index and the files on the filesystem.
1218 </p>
1219 </dd>
1220 </dl></div>
1221 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1222 what is being compared. After that, all the commands print one output
1223 line per changed file.</p></div>
1227 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1228 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1229 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1230 create :000000 100644 0000000... 1234567... A file4
1231 delete :100644 000000 1234567... 0000000... D file5
1232 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1233 </div></div>
1236 <li>
1237 <p>
1238 a colon.
1239 </p>
1240 </li>
1241 <li>
1242 <p>
1244 </p>
1245 </li>
1246 <li>
1247 <p>
1248 a space.
1249 </p>
1250 </li>
1251 <li>
1252 <p>
1254 </p>
1255 </li>
1256 <li>
1257 <p>
1258 a space.
1259 </p>
1260 </li>
1261 <li>
1262 <p>
1264 </p>
1265 </li>
1266 <li>
1267 <p>
1268 a space.
1269 </p>
1270 </li>
1271 <li>
1272 <p>
1274 </p>
1275 </li>
1276 <li>
1277 <p>
1278 a space.
1279 </p>
1280 </li>
1281 <li>
1282 <p>
1284 </p>
1285 </li>
1286 <li>
1287 <p>
1288 a tab or a NUL when <em>-z</em> option is used.
1289 </p>
1290 </li>
1291 <li>
1292 <p>
1294 </p>
1295 </li>
1296 <li>
1297 <p>
1298 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1299 </p>
1300 </li>
1301 <li>
1302 <p>
1304 </p>
1305 </li>
1306 <li>
1307 <p>
1308 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1309 </p>
1310 </li>
1311 </ol></div>
1314 <li>
1315 <p>
1316 A: addition of a file
1317 </p>
1318 </li>
1319 <li>
1320 <p>
1321 C: copy of a file into a new one
1322 </p>
1323 </li>
1324 <li>
1325 <p>
1326 D: deletion of a file
1327 </p>
1328 </li>
1329 <li>
1330 <p>
1331 M: modification of the contents or mode of a file
1332 </p>
1333 </li>
1334 <li>
1335 <p>
1336 R: renaming of a file
1337 </p>
1338 </li>
1339 <li>
1340 <p>
1341 T: change in the type of the file
1342 </p>
1343 </li>
1344 <li>
1345 <p>
1346 U: file is unmerged (you must complete the merge before it can
1347 be committed)
1348 </p>
1349 </li>
1350 <li>
1351 <p>
1353 </p>
1354 </li>
1355 </ul></div>
1357 percentage of similarity between the source and target of the move or
1358 copy), and are the only ones to be so.</p></div>
1359 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1360 and it is out of sync with the index.</p></div>
1364 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1365 </div></div>
1366 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1367 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1368 respectively.</p></div>
1369 </div>
1373 can take <em>-c</em> or <em>--cc</em> option
1374 to generate diff output also for merge commits. The output differs
1375 from the format described above in the following way:</p></div>
1377 <li>
1378 <p>
1379 there is a colon for each parent
1380 </p>
1381 </li>
1382 <li>
1383 <p>
1385 </p>
1386 </li>
1387 <li>
1388 <p>
1389 status is concatenated status characters for each parent
1390 </p>
1391 </li>
1392 <li>
1393 <p>
1395 </p>
1396 </li>
1397 <li>
1398 <p>
1400 </p>
1401 </li>
1402 </ol></div>
1406 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1407 </div></div>
1408 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1409 all parents.</p></div>
1410 </div>
1416 do not produce the output described above; instead they produce a
1417 patch file. You can customize the creation of such patches via the
1418 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1419 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1420 diff format:</p></div>
1422 <li>
1423 <p>
1425 </p>
1428 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1429 </div></div>
1430 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1431 involved. Especially, even for a creation or a deletion,
1432 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1433 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1434 name of the source file of the rename/copy and the name of
1435 the file that rename/copy produces, respectively.</p></div>
1436 </li>
1437 <li>
1438 <p>
1439 It is followed by one or more extended header lines:
1440 </p>
1443 <pre><tt>old mode <mode>
1444 new mode <mode>
1445 deleted file mode <mode>
1446 new file mode <mode>
1447 copy from <path>
1448 copy to <path>
1449 rename from <path>
1450 rename to <path>
1451 similarity index <number>
1452 dissimilarity index <number>
1453 index <hash>..<hash> <mode></tt></pre>
1454 </div></div>
1455 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1456 and file permission bits.</p></div>
1457 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1459 the dissimilarity index is the percentage of changed lines. It
1460 is a rounded down integer, followed by a percent sign. The
1461 similarity index value of 100% is thus reserved for two equal
1462 files, while 100% dissimilarity means that no line from the old
1463 file made it into the new one.</p></div>
1464 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1465 The <mode> is included if the file mode does not change; otherwise,
1466 separate lines indicate the old and the new mode.</p></div>
1467 </li>
1468 <li>
1469 <p>
1470 TAB, LF, double quote and backslash characters in pathnames
1472 If there is need for such substitution then the whole
1473 pathname is put in double quotes.
1474 </p>
1475 </li>
1476 <li>
1477 <p>
1480 It is incorrect to apply each change to each file sequentially. For
1481 example, this patch will swap a and b:
1482 </p>
1485 <pre><tt>diff --git a/a b/b
1486 rename from a
1487 rename to b
1488 diff --git a/b b/a
1489 rename from b
1490 rename to a</tt></pre>
1491 </div></div>
1492 </li>
1493 </ol></div>
1494 </div>
1497 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1500 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1501 of these commands to force generation of diffs with individual parents
1502 of a merge.</p></div>
1506 <pre><tt>diff --combined describe.c
1507 index fabadb8,cc95eb0..4866510
1508 --- a/describe.c
1509 +++ b/describe.c
1512 }
1514 - static void describe(char *arg)
1515 -static void describe(struct commit *cmit, int last_one)
1516 ++static void describe(char *arg, int last_one)
1517 {
1518 + unsigned char sha1[20];
1519 + struct commit *cmit;
1520 struct commit_list *list;
1521 static int initialized = 0;
1522 struct commit_name *n;
1525 + usage(describe_usage);
1526 + cmit = lookup_commit_reference(sha1);
1527 + if (!cmit)
1528 + usage(describe_usage);
1529 +
1530 if (!initialized) {
1531 initialized = 1;
1532 for_each_ref(get_name);</tt></pre>
1533 </div></div>
1535 <li>
1536 <p>
1537 It is preceded with a "git diff" header, that looks like
1539 </p>
1543 </div></div>
1548 </div></div>
1549 </li>
1550 <li>
1551 <p>
1552 It is followed by one or more extended header lines
1553 (this example shows a merge with two parents):
1554 </p>
1561 </div></div>
1562 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1564 information about detected contents movement (renames and
1565 copying detection) are designed to work with diff of two
1567 </li>
1568 <li>
1569 <p>
1570 It is followed by two-line from-file/to-file header
1571 </p>
1574 <pre><tt>--- a/file
1575 +++ b/file</tt></pre>
1576 </div></div>
1579 files.</p></div>
1580 </li>
1581 <li>
1582 <p>
1583 Chunk header format is modified to prevent people from
1585 was created for review of merge commit changes, and was not
1586 meant for apply. The change is similar to the change in the
1588 </p>
1591 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1592 </div></div>
1594 header for combined diff format.</p></div>
1595 </li>
1596 </ol></div>
1598 files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but
1600 compares two or more files file1, file2,… with one file X, and
1601 shows how X differs from each of fileN. One column for each of
1602 fileN is prepended to the output line to note how X’s line is
1603 different from it.</p></div>
1604 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1606 in the column N means that the line appears in the result,
1607 and fileN does not have that line (in other words, the line was
1608 added, from the point of view of that parent).</p></div>
1612 in either file1 nor file2). Also eight other lines are the same
1614 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1615 merge commit with the merge result (i.e. file1..fileN are the
1617 two unresolved merge parents with the working tree file
1620 </div>
1623 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1625 output. These options can be combined with other options, such as
1627 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1628 formats the pathnames compactly by combining common prefix and suffix of
1634 </div></div>
1635 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1637 like this:</p></div>
1642 </div></div>
1645 <li>
1646 <p>
1647 the number of added lines;
1648 </p>
1649 </li>
1650 <li>
1651 <p>
1652 a tab;
1653 </p>
1654 </li>
1655 <li>
1656 <p>
1657 the number of deleted lines;
1658 </p>
1659 </li>
1660 <li>
1661 <p>
1662 a tab;
1663 </p>
1664 </li>
1665 <li>
1666 <p>
1667 pathname (possibly with rename/copy information);
1668 </p>
1669 </li>
1670 <li>
1671 <p>
1672 a newline.
1673 </p>
1674 </li>
1675 </ol></div>
1676 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1681 </div></div>
1684 <li>
1685 <p>
1686 the number of added lines;
1687 </p>
1688 </li>
1689 <li>
1690 <p>
1691 a tab;
1692 </p>
1693 </li>
1694 <li>
1695 <p>
1696 the number of deleted lines;
1697 </p>
1698 </li>
1699 <li>
1700 <p>
1701 a tab;
1702 </p>
1703 </li>
1704 <li>
1705 <p>
1706 a NUL (only exists if renamed/copied);
1707 </p>
1708 </li>
1709 <li>
1710 <p>
1711 pathname in preimage;
1712 </p>
1713 </li>
1714 <li>
1715 <p>
1716 a NUL (only exists if renamed/copied);
1717 </p>
1718 </li>
1719 <li>
1720 <p>
1721 pathname in postimage (only exists if renamed/copied);
1722 </p>
1723 </li>
1724 <li>
1725 <p>
1726 a NUL.
1727 </p>
1728 </li>
1729 </ol></div>
1730 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1731 scripts that read the output to tell if the current record being read is
1732 a single-path record or a rename/copy record without reading ahead.
1735 </div>
1740 Various ways to check your working tree
1741 </dt>
1742 <dd>
1748 </div></div>
1750 <li>
1751 <p>
1752 Changes in the working tree not yet staged for the next commit.
1753 </p>
1754 </li>
1755 <li>
1756 <p>
1757 Changes between the index and your last commit; what you
1759 </p>
1760 </li>
1761 <li>
1762 <p>
1763 Changes in the working tree since your last commit; what you
1764 would be committing if you run "git commit -a"
1765 </p>
1766 </li>
1767 </ol></div>
1768 </dd>
1770 Comparing with arbitrary commits
1771 </dt>
1772 <dd>
1778 </div></div>
1780 <li>
1781 <p>
1782 Instead of using the tip of the current branch, compare with the
1783 tip of "test" branch.
1784 </p>
1785 </li>
1786 <li>
1787 <p>
1788 Instead of comparing with the tip of "test" branch, compare with
1789 the tip of the current branch, but limit the comparison to the
1790 file "test".
1791 </p>
1792 </li>
1793 <li>
1794 <p>
1795 Compare the version before the last commit and the last commit.
1796 </p>
1797 </li>
1798 </ol></div>
1799 </dd>
1801 Comparing branches
1802 </dt>
1803 <dd>
1809 </div></div>
1811 <li>
1812 <p>
1813 Changes between the tips of the topic and the master branches.
1814 </p>
1815 </li>
1816 <li>
1817 <p>
1818 Same as above.
1819 </p>
1820 </li>
1821 <li>
1822 <p>
1823 Changes that occurred on the master branch since when the topic
1824 branch was started off it.
1825 </p>
1826 </li>
1827 </ol></div>
1828 </dd>
1830 Limiting the diff output
1831 </dt>
1832 <dd>
1838 </div></div>
1840 <li>
1841 <p>
1842 Show only modification, rename and copy, but not addition
1843 nor deletion.
1844 </p>
1845 </li>
1846 <li>
1847 <p>
1848 Show only names and the nature of change, but not actual
1849 diff output.
1850 </p>
1851 </li>
1852 <li>
1853 <p>
1854 Limit diff output to named subtrees.
1855 </p>
1856 </li>
1857 </ol></div>
1858 </dd>
1860 Munging the diff output
1861 </dt>
1862 <dd>
1867 </div></div>
1869 <li>
1870 <p>
1871 Spend extra cycles to find renames, copies and complete
1872 rewrites (very expensive).
1873 </p>
1874 </li>
1875 <li>
1876 <p>
1877 Output diff in reverse.
1878 </p>
1879 </li>
1880 </ol></div>
1881 </dd>
1882 </dl></div>
1883 </div>
1892 </div>
1896 </div>
1900 </div>
1901 </div>
1902 </body>
1903 </html>