| blob | 23cb5d0f86e69ecb27bbeb787d727e6267a30a7d |
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 always (the default), never, or auto.
694 </p>
695 </dd>
697 --no-color
698 </dt>
699 <dd>
700 <p>
701 Turn off colored diff, even when the configuration file
702 gives the default to color output.
703 Same as <tt>--color=never</tt>.
704 </p>
705 </dd>
707 --word-diff[=<mode>]
708 </dt>
709 <dd>
710 <p>
711 Show a word diff, using the <mode> to delimit changed words.
712 By default, words are delimited by whitespace; see
713 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
714 must be one of:
715 </p>
718 color
719 </dt>
720 <dd>
721 <p>
722 Highlight changed words using only colors. Implies <tt>--color</tt>.
723 </p>
724 </dd>
726 plain
727 </dt>
728 <dd>
729 <p>
730 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
731 attempts to escape the delimiters if they appear in the input,
732 so the output may be ambiguous.
733 </p>
734 </dd>
736 porcelain
737 </dt>
738 <dd>
739 <p>
740 Use a special line-based format intended for script
741 consumption. Added/removed/unchanged runs are printed in the
742 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
743 character at the beginning of the line and extending to the
744 end of the line. Newlines in the input are represented by a
745 tilde <tt>~</tt> on a line of its own.
746 </p>
747 </dd>
749 none
750 </dt>
751 <dd>
752 <p>
753 Disable word diff again.
754 </p>
755 </dd>
756 </dl></div>
758 highlight the changed parts in all modes if enabled.</p></div>
759 </dd>
761 --word-diff-regex=<regex>
762 </dt>
763 <dd>
764 <p>
765 Use <regex> to decide what a word is, instead of considering
766 runs of non-whitespace to be a word. Also implies
767 <tt>--word-diff</tt> unless it was already enabled.
768 </p>
770 <regex> is considered a word. Anything between these matches is
771 considered whitespace and ignored(!) for the purposes of finding
772 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
773 expression to make sure that it matches all non-whitespace characters.
774 A match that contains a newline is silently truncated(!) at the
775 newline.</p></div>
776 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
777 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
778 overrides any diff driver or configuration setting. Diff drivers
779 override configuration settings.</p></div>
780 </dd>
782 --color-words[=<regex>]
783 </dt>
784 <dd>
785 <p>
786 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
787 specified) <tt>--word-diff-regex=<regex></tt>.
788 </p>
789 </dd>
791 --no-renames
792 </dt>
793 <dd>
794 <p>
795 Turn off rename detection, even when the configuration
796 file gives the default to do so.
797 </p>
798 </dd>
800 --check
801 </dt>
802 <dd>
803 <p>
804 Warn if changes introduce trailing whitespace
805 or an indent that uses a space before a tab. Exits with
806 non-zero status if problems are found. Not compatible with
807 --exit-code.
808 </p>
809 </dd>
811 --full-index
812 </dt>
813 <dd>
814 <p>
815 Instead of the first handful of characters, show the full
817 line when generating patch format output.
818 </p>
819 </dd>
821 --binary
822 </dt>
823 <dd>
824 <p>
825 In addition to <tt>--full-index</tt>, output a binary diff that
826 can be applied with <tt>git-apply</tt>.
827 </p>
828 </dd>
830 --abbrev[=<n>]
831 </dt>
832 <dd>
833 <p>
834 Instead of showing the full 40-byte hexadecimal object
835 name in diff-raw format output and diff-tree header
836 lines, show only a partial prefix. This is
837 independent of the <tt>--full-index</tt> option above, which controls
838 the diff-patch output format. Non default number of
839 digits can be specified with <tt>--abbrev=<n></tt>.
840 </p>
841 </dd>
843 -B[<n>][/<m>]
844 </dt>
846 --break-rewrites[=[<n>][/<m>]]
847 </dt>
848 <dd>
849 <p>
850 Break complete rewrite changes into pairs of delete and
851 create. This serves two purposes:
852 </p>
854 not as a series of deletion and insertion mixed together with a very
855 few lines that happen to match textually as the context, but as a
856 single deletion of everything old followed by a single insertion of
857 everything new, and the number <tt>m</tt> controls this aspect of the -B
858 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
859 original should remain in the result for git to consider it a total
860 rewrite (i.e. otherwise the resulting patch will be a series of
861 deletion and insertion mixed together with context lines).</p></div>
863 source of a rename (usually -M only considers a file that disappeared
864 as the source of a rename), and the number <tt>n</tt> controls this aspect of
865 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
866 addition and deletion compared to 20% or more of the file’s size are
867 eligible for being picked up as a possible source of a rename to
868 another file.</p></div>
869 </dd>
871 -M[<n>]
872 </dt>
874 --find-renames[=<n>]
875 </dt>
876 <dd>
877 <p>
878 Detect renames.
879 If <tt>n</tt> is specified, it is a is a threshold on the similarity
880 index (i.e. amount of addition/deletions compared to the
881 file’s size). For example, <tt>-M90%</tt> means git should consider a
882 delete/add pair to be a rename if more than 90% of the file
883 hasn’t changed.
884 </p>
885 </dd>
887 -C[<n>]
888 </dt>
890 --find-copies[=<n>]
891 </dt>
892 <dd>
893 <p>
894 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
895 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
896 </p>
897 </dd>
899 --find-copies-harder
900 </dt>
901 <dd>
902 <p>
903 For performance reasons, by default, <tt>-C</tt> option finds copies only
904 if the original file of the copy was modified in the same
905 changeset. This flag makes the command
906 inspect unmodified files as candidates for the source of
907 copy. This is a very expensive operation for large
908 projects, so use it with caution. Giving more than one
909 <tt>-C</tt> option has the same effect.
910 </p>
911 </dd>
913 -D
914 </dt>
916 --irreversible-delete
917 </dt>
918 <dd>
919 <p>
920 Omit the preimage for deletes, i.e. print only the header but not
921 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
922 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
923 solely for people who want to just concentrate on reviewing the
924 text after the change. In addition, the output obviously lack
925 enough information to apply such a patch in reverse, even manually,
926 hence the name of the option.
927 </p>
928 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
929 of a delete/create pair.</p></div>
930 </dd>
932 -l<num>
933 </dt>
934 <dd>
935 <p>
936 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
937 is the number of potential rename/copy targets. This
938 option prevents rename/copy detection from running if
939 the number of rename/copy targets exceeds the specified
940 number.
941 </p>
942 </dd>
944 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
945 </dt>
946 <dd>
947 <p>
948 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
949 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
950 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
951 are Unmerged (<tt>U</tt>), are
952 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
953 Any combination of the filter characters (including none) can be used.
954 When <tt>*</tt> (All-or-none) is added to the combination, all
955 paths are selected if there is any file that matches
956 other criteria in the comparison; if there is no file
957 that matches other criteria, nothing is selected.
958 </p>
959 </dd>
961 -S<string>
962 </dt>
963 <dd>
964 <p>
965 Look for differences that introduce or remove an instance of
966 <string>. Note that this is different than the string simply
967 appearing in diff output; see the <em>pickaxe</em> entry in
969 </p>
970 </dd>
972 -G<regex>
973 </dt>
974 <dd>
975 <p>
976 Look for differences whose added or removed line matches
977 the given <regex>.
978 </p>
979 </dd>
981 --pickaxe-all
982 </dt>
983 <dd>
984 <p>
985 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
986 changeset, not just the files that contain the change
987 in <string>.
988 </p>
989 </dd>
991 --pickaxe-regex
992 </dt>
993 <dd>
994 <p>
995 Make the <string> not a plain string but an extended POSIX
996 regex to match.
997 </p>
998 </dd>
1000 -O<orderfile>
1001 </dt>
1002 <dd>
1003 <p>
1004 Output the patch in the order specified in the
1005 <orderfile>, which has one shell glob pattern per line.
1006 </p>
1007 </dd>
1009 -R
1010 </dt>
1011 <dd>
1012 <p>
1013 Swap two inputs; that is, show differences from index or
1014 on-disk file to tree contents.
1015 </p>
1016 </dd>
1018 --relative[=<path>]
1019 </dt>
1020 <dd>
1021 <p>
1022 When run from a subdirectory of the project, it can be
1023 told to exclude changes outside the directory and show
1024 pathnames relative to it with this option. When you are
1025 not in a subdirectory (e.g. in a bare repository), you
1026 can name which subdirectory to make the output relative
1027 to by giving a <path> as an argument.
1028 </p>
1029 </dd>
1031 -a
1032 </dt>
1034 --text
1035 </dt>
1036 <dd>
1037 <p>
1038 Treat all files as text.
1039 </p>
1040 </dd>
1042 --ignore-space-at-eol
1043 </dt>
1044 <dd>
1045 <p>
1046 Ignore changes in whitespace at EOL.
1047 </p>
1048 </dd>
1050 -b
1051 </dt>
1053 --ignore-space-change
1054 </dt>
1055 <dd>
1056 <p>
1057 Ignore changes in amount of whitespace. This ignores whitespace
1058 at line end, and considers all other sequences of one or
1059 more whitespace characters to be equivalent.
1060 </p>
1061 </dd>
1063 -w
1064 </dt>
1066 --ignore-all-space
1067 </dt>
1068 <dd>
1069 <p>
1070 Ignore whitespace when comparing lines. This ignores
1071 differences even if one line has whitespace where the other
1072 line has none.
1073 </p>
1074 </dd>
1076 --inter-hunk-context=<lines>
1077 </dt>
1078 <dd>
1079 <p>
1080 Show the context between diff hunks, up to the specified number
1081 of lines, thereby fusing hunks that are close to each other.
1082 </p>
1083 </dd>
1085 --exit-code
1086 </dt>
1087 <dd>
1088 <p>
1089 Make the program exit with codes similar to diff(1).
1090 That is, it exits with 1 if there were differences and
1091 0 means no differences.
1092 </p>
1093 </dd>
1095 --quiet
1096 </dt>
1097 <dd>
1098 <p>
1099 Disable all output of the program. Implies <tt>--exit-code</tt>.
1100 </p>
1101 </dd>
1103 --ext-diff
1104 </dt>
1105 <dd>
1106 <p>
1107 Allow an external diff helper to be executed. If you set an
1110 </p>
1111 </dd>
1113 --no-ext-diff
1114 </dt>
1115 <dd>
1116 <p>
1117 Disallow external diff drivers.
1118 </p>
1119 </dd>
1121 --ignore-submodules[=<when>]
1122 </dt>
1123 <dd>
1124 <p>
1125 Ignore changes to submodules in the diff generation. <when> can be
1128 untracked or modified files or its HEAD differs from the commit recorded
1129 in the superproject and can be used to override any settings of the
1130 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1132 contain untracked content (but they are still scanned for modified
1134 only changes to the commits stored in the superproject are shown (this was
1136 </p>
1137 </dd>
1139 --src-prefix=<prefix>
1140 </dt>
1141 <dd>
1142 <p>
1144 </p>
1145 </dd>
1147 --dst-prefix=<prefix>
1148 </dt>
1149 <dd>
1150 <p>
1152 </p>
1153 </dd>
1155 --no-prefix
1156 </dt>
1157 <dd>
1158 <p>
1159 Do not show any source or destination prefix.
1160 </p>
1161 </dd>
1162 </dl></div>
1167 <path>…
1168 </dt>
1169 <dd>
1170 <p>
1171 The <paths> parameters, when given, are used to limit
1172 the diff to the named paths (you can give directory
1173 names and get diff for all files under them).
1174 </p>
1175 </dd>
1176 </dl></div>
1177 </div>
1183 compared differs:</p></div>
1186 git-diff-index <tree-ish>
1187 </dt>
1188 <dd>
1189 <p>
1190 compares the <tree-ish> and the files on the filesystem.
1191 </p>
1192 </dd>
1194 git-diff-index --cached <tree-ish>
1195 </dt>
1196 <dd>
1197 <p>
1198 compares the <tree-ish> and the index.
1199 </p>
1200 </dd>
1202 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1203 </dt>
1204 <dd>
1205 <p>
1206 compares the trees named by the two arguments.
1207 </p>
1208 </dd>
1210 git-diff-files [<pattern>…]
1211 </dt>
1212 <dd>
1213 <p>
1214 compares the index and the files on the filesystem.
1215 </p>
1216 </dd>
1217 </dl></div>
1218 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1219 what is being compared. After that, all the commands print one output
1220 line per changed file.</p></div>
1224 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1225 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1226 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1227 create :000000 100644 0000000... 1234567... A file4
1228 delete :100644 000000 1234567... 0000000... D file5
1229 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1230 </div></div>
1233 <li>
1234 <p>
1235 a colon.
1236 </p>
1237 </li>
1238 <li>
1239 <p>
1241 </p>
1242 </li>
1243 <li>
1244 <p>
1245 a space.
1246 </p>
1247 </li>
1248 <li>
1249 <p>
1251 </p>
1252 </li>
1253 <li>
1254 <p>
1255 a space.
1256 </p>
1257 </li>
1258 <li>
1259 <p>
1261 </p>
1262 </li>
1263 <li>
1264 <p>
1265 a space.
1266 </p>
1267 </li>
1268 <li>
1269 <p>
1271 </p>
1272 </li>
1273 <li>
1274 <p>
1275 a space.
1276 </p>
1277 </li>
1278 <li>
1279 <p>
1281 </p>
1282 </li>
1283 <li>
1284 <p>
1285 a tab or a NUL when <em>-z</em> option is used.
1286 </p>
1287 </li>
1288 <li>
1289 <p>
1291 </p>
1292 </li>
1293 <li>
1294 <p>
1295 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1296 </p>
1297 </li>
1298 <li>
1299 <p>
1301 </p>
1302 </li>
1303 <li>
1304 <p>
1305 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1306 </p>
1307 </li>
1308 </ol></div>
1311 <li>
1312 <p>
1313 A: addition of a file
1314 </p>
1315 </li>
1316 <li>
1317 <p>
1318 C: copy of a file into a new one
1319 </p>
1320 </li>
1321 <li>
1322 <p>
1323 D: deletion of a file
1324 </p>
1325 </li>
1326 <li>
1327 <p>
1328 M: modification of the contents or mode of a file
1329 </p>
1330 </li>
1331 <li>
1332 <p>
1333 R: renaming of a file
1334 </p>
1335 </li>
1336 <li>
1337 <p>
1338 T: change in the type of the file
1339 </p>
1340 </li>
1341 <li>
1342 <p>
1343 U: file is unmerged (you must complete the merge before it can
1344 be committed)
1345 </p>
1346 </li>
1347 <li>
1348 <p>
1350 </p>
1351 </li>
1352 </ul></div>
1354 percentage of similarity between the source and target of the move or
1355 copy), and are the only ones to be so.</p></div>
1356 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1357 and it is out of sync with the index.</p></div>
1361 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1362 </div></div>
1363 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1364 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1365 respectively.</p></div>
1366 </div>
1370 can take <em>-c</em> or <em>--cc</em> option
1371 to generate diff output also for merge commits. The output differs
1372 from the format described above in the following way:</p></div>
1374 <li>
1375 <p>
1376 there is a colon for each parent
1377 </p>
1378 </li>
1379 <li>
1380 <p>
1382 </p>
1383 </li>
1384 <li>
1385 <p>
1386 status is concatenated status characters for each parent
1387 </p>
1388 </li>
1389 <li>
1390 <p>
1392 </p>
1393 </li>
1394 <li>
1395 <p>
1397 </p>
1398 </li>
1399 </ol></div>
1403 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1404 </div></div>
1405 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1406 all parents.</p></div>
1407 </div>
1413 do not produce the output described above; instead they produce a
1414 patch file. You can customize the creation of such patches via the
1415 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1416 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1417 diff format:</p></div>
1419 <li>
1420 <p>
1422 </p>
1425 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1426 </div></div>
1427 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1428 involved. Especially, even for a creation or a deletion,
1429 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1430 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1431 name of the source file of the rename/copy and the name of
1432 the file that rename/copy produces, respectively.</p></div>
1433 </li>
1434 <li>
1435 <p>
1436 It is followed by one or more extended header lines:
1437 </p>
1440 <pre><tt>old mode <mode>
1441 new mode <mode>
1442 deleted file mode <mode>
1443 new file mode <mode>
1444 copy from <path>
1445 copy to <path>
1446 rename from <path>
1447 rename to <path>
1448 similarity index <number>
1449 dissimilarity index <number>
1450 index <hash>..<hash> <mode></tt></pre>
1451 </div></div>
1452 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1453 and file permission bits.</p></div>
1454 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1456 the dissimilarity index is the percentage of changed lines. It
1457 is a rounded down integer, followed by a percent sign. The
1458 similarity index value of 100% is thus reserved for two equal
1459 files, while 100% dissimilarity means that no line from the old
1460 file made it into the new one.</p></div>
1461 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1462 The <mode> is included if the file mode does not change; otherwise,
1463 separate lines indicate the old and the new mode.</p></div>
1464 </li>
1465 <li>
1466 <p>
1467 TAB, LF, double quote and backslash characters in pathnames
1469 If there is need for such substitution then the whole
1470 pathname is put in double quotes.
1471 </p>
1472 </li>
1473 <li>
1474 <p>
1477 It is incorrect to apply each change to each file sequentially. For
1478 example, this patch will swap a and b:
1479 </p>
1482 <pre><tt>diff --git a/a b/b
1483 rename from a
1484 rename to b
1485 diff --git a/b b/a
1486 rename from b
1487 rename to a</tt></pre>
1488 </div></div>
1489 </li>
1490 </ol></div>
1491 </div>
1494 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1497 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1498 of these commands to force generation of diffs with individual parents
1499 of a merge.</p></div>
1503 <pre><tt>diff --combined describe.c
1504 index fabadb8,cc95eb0..4866510
1505 --- a/describe.c
1506 +++ b/describe.c
1509 }
1511 - static void describe(char *arg)
1512 -static void describe(struct commit *cmit, int last_one)
1513 ++static void describe(char *arg, int last_one)
1514 {
1515 + unsigned char sha1[20];
1516 + struct commit *cmit;
1517 struct commit_list *list;
1518 static int initialized = 0;
1519 struct commit_name *n;
1522 + usage(describe_usage);
1523 + cmit = lookup_commit_reference(sha1);
1524 + if (!cmit)
1525 + usage(describe_usage);
1526 +
1527 if (!initialized) {
1528 initialized = 1;
1529 for_each_ref(get_name);</tt></pre>
1530 </div></div>
1532 <li>
1533 <p>
1534 It is preceded with a "git diff" header, that looks like
1536 </p>
1540 </div></div>
1545 </div></div>
1546 </li>
1547 <li>
1548 <p>
1549 It is followed by one or more extended header lines
1550 (this example shows a merge with two parents):
1551 </p>
1558 </div></div>
1559 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1561 information about detected contents movement (renames and
1562 copying detection) are designed to work with diff of two
1564 </li>
1565 <li>
1566 <p>
1567 It is followed by two-line from-file/to-file header
1568 </p>
1571 <pre><tt>--- a/file
1572 +++ b/file</tt></pre>
1573 </div></div>
1576 files.</p></div>
1577 </li>
1578 <li>
1579 <p>
1580 Chunk header format is modified to prevent people from
1582 was created for review of merge commit changes, and was not
1583 meant for apply. The change is similar to the change in the
1585 </p>
1588 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1589 </div></div>
1591 header for combined diff format.</p></div>
1592 </li>
1593 </ol></div>
1595 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
1597 compares two or more files file1, file2,… with one file X, and
1598 shows how X differs from each of fileN. One column for each of
1599 fileN is prepended to the output line to note how X’s line is
1600 different from it.</p></div>
1601 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1603 in the column N means that the line appears in the result,
1604 and fileN does not have that line (in other words, the line was
1605 added, from the point of view of that parent).</p></div>
1609 in either file1 nor file2). Also eight other lines are the same
1611 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1612 merge commit with the merge result (i.e. file1..fileN are the
1614 two unresolved merge parents with the working tree file
1617 </div>
1620 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1622 output. These options can be combined with other options, such as
1624 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1625 formats the pathnames compactly by combining common prefix and suffix of
1631 </div></div>
1632 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1634 like this:</p></div>
1639 </div></div>
1642 <li>
1643 <p>
1644 the number of added lines;
1645 </p>
1646 </li>
1647 <li>
1648 <p>
1649 a tab;
1650 </p>
1651 </li>
1652 <li>
1653 <p>
1654 the number of deleted lines;
1655 </p>
1656 </li>
1657 <li>
1658 <p>
1659 a tab;
1660 </p>
1661 </li>
1662 <li>
1663 <p>
1664 pathname (possibly with rename/copy information);
1665 </p>
1666 </li>
1667 <li>
1668 <p>
1669 a newline.
1670 </p>
1671 </li>
1672 </ol></div>
1673 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1678 </div></div>
1681 <li>
1682 <p>
1683 the number of added lines;
1684 </p>
1685 </li>
1686 <li>
1687 <p>
1688 a tab;
1689 </p>
1690 </li>
1691 <li>
1692 <p>
1693 the number of deleted lines;
1694 </p>
1695 </li>
1696 <li>
1697 <p>
1698 a tab;
1699 </p>
1700 </li>
1701 <li>
1702 <p>
1703 a NUL (only exists if renamed/copied);
1704 </p>
1705 </li>
1706 <li>
1707 <p>
1708 pathname in preimage;
1709 </p>
1710 </li>
1711 <li>
1712 <p>
1713 a NUL (only exists if renamed/copied);
1714 </p>
1715 </li>
1716 <li>
1717 <p>
1718 pathname in postimage (only exists if renamed/copied);
1719 </p>
1720 </li>
1721 <li>
1722 <p>
1723 a NUL.
1724 </p>
1725 </li>
1726 </ol></div>
1727 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1728 scripts that read the output to tell if the current record being read is
1729 a single-path record or a rename/copy record without reading ahead.
1732 </div>
1737 Various ways to check your working tree
1738 </dt>
1739 <dd>
1745 </div></div>
1747 <li>
1748 <p>
1749 Changes in the working tree not yet staged for the next commit.
1750 </p>
1751 </li>
1752 <li>
1753 <p>
1754 Changes between the index and your last commit; what you
1756 </p>
1757 </li>
1758 <li>
1759 <p>
1760 Changes in the working tree since your last commit; what you
1761 would be committing if you run "git commit -a"
1762 </p>
1763 </li>
1764 </ol></div>
1765 </dd>
1767 Comparing with arbitrary commits
1768 </dt>
1769 <dd>
1775 </div></div>
1777 <li>
1778 <p>
1779 Instead of using the tip of the current branch, compare with the
1780 tip of "test" branch.
1781 </p>
1782 </li>
1783 <li>
1784 <p>
1785 Instead of comparing with the tip of "test" branch, compare with
1786 the tip of the current branch, but limit the comparison to the
1787 file "test".
1788 </p>
1789 </li>
1790 <li>
1791 <p>
1792 Compare the version before the last commit and the last commit.
1793 </p>
1794 </li>
1795 </ol></div>
1796 </dd>
1798 Comparing branches
1799 </dt>
1800 <dd>
1806 </div></div>
1808 <li>
1809 <p>
1810 Changes between the tips of the topic and the master branches.
1811 </p>
1812 </li>
1813 <li>
1814 <p>
1815 Same as above.
1816 </p>
1817 </li>
1818 <li>
1819 <p>
1820 Changes that occurred on the master branch since when the topic
1821 branch was started off it.
1822 </p>
1823 </li>
1824 </ol></div>
1825 </dd>
1827 Limiting the diff output
1828 </dt>
1829 <dd>
1835 </div></div>
1837 <li>
1838 <p>
1839 Show only modification, rename and copy, but not addition
1840 nor deletion.
1841 </p>
1842 </li>
1843 <li>
1844 <p>
1845 Show only names and the nature of change, but not actual
1846 diff output.
1847 </p>
1848 </li>
1849 <li>
1850 <p>
1851 Limit diff output to named subtrees.
1852 </p>
1853 </li>
1854 </ol></div>
1855 </dd>
1857 Munging the diff output
1858 </dt>
1859 <dd>
1864 </div></div>
1866 <li>
1867 <p>
1868 Spend extra cycles to find renames, copies and complete
1869 rewrites (very expensive).
1870 </p>
1871 </li>
1872 <li>
1873 <p>
1874 Output diff in reverse.
1875 </p>
1876 </li>
1877 </ol></div>
1878 </dd>
1879 </dl></div>
1880 </div>
1889 </div>
1893 </div>
1897 </div>
1898 </div>
1899 </body>
1900 </html>