| blob | cfba0837be441d97b0a2d23d3001086c6dcc7f3d |
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 --staged is a synonym of --cached.
456 </p>
457 </dd>
460 </dt>
461 <dd>
462 <p>
463 This form is to view the changes you have in your
465 use HEAD to compare it with the latest commit, or a
466 branch name to compare with the tip of a different
467 branch.
468 </p>
469 </dd>
472 </dt>
473 <dd>
474 <p>
475 This is to view the changes between two arbitrary
477 </p>
478 </dd>
481 </dt>
482 <dd>
483 <p>
485 one side is omitted, it will have the same effect as
486 using HEAD instead.
487 </p>
488 </dd>
491 </dt>
492 <dd>
493 <p>
494 This form is to view the changes on the branch containing
497 "git diff $(git-merge-base A B) B". You can omit any one
499 </p>
500 </dd>
501 </dl></div>
504 in the last two forms that use ".." notations, can be any
510 and the range notations ("<commit>..<commit>" and
511 "<commit>...<commit>") do not mean a range as defined in the
513 </div>
518 -p
519 </dt>
521 -u
522 </dt>
524 --patch
525 </dt>
526 <dd>
527 <p>
528 Generate patch (see section on generating patches).
529 This is the default.
530 </p>
531 </dd>
534 </dt>
537 </dt>
538 <dd>
539 <p>
541 the usual three.
543 </p>
544 </dd>
546 --raw
547 </dt>
548 <dd>
549 <p>
550 Generate the raw format.
552 </p>
553 </dd>
555 --patch-with-raw
556 </dt>
557 <dd>
558 <p>
560 </p>
561 </dd>
563 --patience
564 </dt>
565 <dd>
566 <p>
567 Generate a diff using the "patience diff" algorithm.
568 </p>
569 </dd>
572 </dt>
573 <dd>
574 <p>
575 Generate a diffstat. You can override the default
577 The width of the filename part can be controlled by
578 giving another width to it separated by a comma.
579 </p>
580 </dd>
582 --numstat
583 </dt>
584 <dd>
585 <p>
587 deleted lines in decimal notation and pathname without
588 abbreviation, to make it more machine friendly. For
591 </p>
592 </dd>
594 --shortstat
595 </dt>
596 <dd>
597 <p>
599 number of modified files, as well as number of added and deleted
600 lines.
601 </p>
602 </dd>
605 </dt>
606 <dd>
607 <p>
608 Output the distribution of relative amount of changes (number of lines added or
609 removed) for each sub-directory. Directories with changes below
610 a cut-off percent (3% by default) are not shown. The cut-off percent
613 </p>
614 </dd>
617 </dt>
618 <dd>
619 <p>
621 </p>
622 </dd>
624 --summary
625 </dt>
626 <dd>
627 <p>
628 Output a condensed summary of extended header information
629 such as creations, renames and mode changes.
630 </p>
631 </dd>
633 --patch-with-stat
634 </dt>
635 <dd>
636 <p>
638 </p>
639 </dd>
641 -z
642 </dt>
643 <dd>
644 <p>
645 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
646 given, do not munge pathnames and use NULs as output field terminators.
647 </p>
648 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
650 respectively, and the pathname will be enclosed in double quotes if
651 any of those replacements occurred.</p></div>
652 </dd>
654 --name-only
655 </dt>
656 <dd>
657 <p>
658 Show only names of changed files.
659 </p>
660 </dd>
662 --name-status
663 </dt>
664 <dd>
665 <p>
666 Show only names and status of changed files. See the description
667 of the <tt>--diff-filter</tt> option on what the status letters mean.
668 </p>
669 </dd>
671 --submodule[=<format>]
672 </dt>
673 <dd>
674 <p>
675 Chose the output format for submodule differences. <format> can be one of
676 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
677 is used when this option is not given. <em>log</em> is the default value for this
678 option and lists the commits in that commit range like the <em>summary</em>
680 </p>
681 </dd>
683 --color[=<when>]
684 </dt>
685 <dd>
686 <p>
687 Show colored diff.
688 The value must be always (the default), never, or auto.
689 </p>
690 </dd>
692 --no-color
693 </dt>
694 <dd>
695 <p>
696 Turn off colored diff, even when the configuration file
697 gives the default to color output.
698 Same as <tt>--color=never</tt>.
699 </p>
700 </dd>
702 --word-diff[=<mode>]
703 </dt>
704 <dd>
705 <p>
706 Show a word diff, using the <mode> to delimit changed words.
707 By default, words are delimited by whitespace; see
708 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
709 must be one of:
710 </p>
713 color
714 </dt>
715 <dd>
716 <p>
717 Highlight changed words using only colors. Implies <tt>--color</tt>.
718 </p>
719 </dd>
721 plain
722 </dt>
723 <dd>
724 <p>
725 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
726 attempts to escape the delimiters if they appear in the input,
727 so the output may be ambiguous.
728 </p>
729 </dd>
731 porcelain
732 </dt>
733 <dd>
734 <p>
735 Use a special line-based format intended for script
736 consumption. Added/removed/unchanged runs are printed in the
737 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
738 character at the beginning of the line and extending to the
739 end of the line. Newlines in the input are represented by a
740 tilde <tt>~</tt> on a line of its own.
741 </p>
742 </dd>
744 none
745 </dt>
746 <dd>
747 <p>
748 Disable word diff again.
749 </p>
750 </dd>
751 </dl></div>
753 highlight the changed parts in all modes if enabled.</p></div>
754 </dd>
756 --word-diff-regex=<regex>
757 </dt>
758 <dd>
759 <p>
760 Use <regex> to decide what a word is, instead of considering
761 runs of non-whitespace to be a word. Also implies
762 <tt>--word-diff</tt> unless it was already enabled.
763 </p>
765 <regex> is considered a word. Anything between these matches is
766 considered whitespace and ignored(!) for the purposes of finding
767 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
768 expression to make sure that it matches all non-whitespace characters.
769 A match that contains a newline is silently truncated(!) at the
770 newline.</p></div>
771 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
772 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
773 overrides any diff driver or configuration setting. Diff drivers
774 override configuration settings.</p></div>
775 </dd>
777 --color-words[=<regex>]
778 </dt>
779 <dd>
780 <p>
781 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
782 specified) <tt>--word-diff-regex=<regex></tt>.
783 </p>
784 </dd>
786 --no-renames
787 </dt>
788 <dd>
789 <p>
790 Turn off rename detection, even when the configuration
791 file gives the default to do so.
792 </p>
793 </dd>
795 --check
796 </dt>
797 <dd>
798 <p>
799 Warn if changes introduce trailing whitespace
800 or an indent that uses a space before a tab. Exits with
801 non-zero status if problems are found. Not compatible with
802 --exit-code.
803 </p>
804 </dd>
806 --full-index
807 </dt>
808 <dd>
809 <p>
810 Instead of the first handful of characters, show the full
812 line when generating patch format output.
813 </p>
814 </dd>
816 --binary
817 </dt>
818 <dd>
819 <p>
820 In addition to <tt>--full-index</tt>, output a binary diff that
821 can be applied with <tt>git-apply</tt>.
822 </p>
823 </dd>
825 --abbrev[=<n>]
826 </dt>
827 <dd>
828 <p>
829 Instead of showing the full 40-byte hexadecimal object
830 name in diff-raw format output and diff-tree header
831 lines, show only a partial prefix. This is
832 independent of the <tt>--full-index</tt> option above, which controls
833 the diff-patch output format. Non default number of
834 digits can be specified with <tt>--abbrev=<n></tt>.
835 </p>
836 </dd>
838 -B[<n>][/<m>]
839 </dt>
841 --break-rewrites[=[<n>][/<m>]]
842 </dt>
843 <dd>
844 <p>
845 Break complete rewrite changes into pairs of delete and
846 create. This serves two purposes:
847 </p>
849 not as a series of deletion and insertion mixed together with a very
850 few lines that happen to match textually as the context, but as a
851 single deletion of everything old followed by a single insertion of
852 everything new, and the number <tt>m</tt> controls this aspect of the -B
853 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
854 original should remain in the result for git to consider it a total
855 rewrite (i.e. otherwise the resulting patch will be a series of
856 deletion and insertion mixed together with context lines).</p></div>
858 source of a rename (usually -M only considers a file that disappeared
859 as the source of a rename), and the number <tt>n</tt> controls this aspect of
860 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
861 addition and deletion compared to 20% or more of the file’s size are
862 eligible for being picked up as a possible source of a rename to
863 another file.</p></div>
864 </dd>
866 -M[<n>]
867 </dt>
869 --find-renames[=<n>]
870 </dt>
871 <dd>
872 <p>
873 Detect renames.
874 If <tt>n</tt> is specified, it is a is a threshold on the similarity
875 index (i.e. amount of addition/deletions compared to the
876 file’s size). For example, <tt>-M90%</tt> means git should consider a
877 delete/add pair to be a rename if more than 90% of the file
878 hasn’t changed.
879 </p>
880 </dd>
882 -C[<n>]
883 </dt>
885 --find-copies[=<n>]
886 </dt>
887 <dd>
888 <p>
889 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
890 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
891 </p>
892 </dd>
894 --find-copies-harder
895 </dt>
896 <dd>
897 <p>
898 For performance reasons, by default, <tt>-C</tt> option finds copies only
899 if the original file of the copy was modified in the same
900 changeset. This flag makes the command
901 inspect unmodified files as candidates for the source of
902 copy. This is a very expensive operation for large
903 projects, so use it with caution. Giving more than one
904 <tt>-C</tt> option has the same effect.
905 </p>
906 </dd>
908 -l<num>
909 </dt>
910 <dd>
911 <p>
912 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
913 is the number of potential rename/copy targets. This
914 option prevents rename/copy detection from running if
915 the number of rename/copy targets exceeds the specified
916 number.
917 </p>
918 </dd>
920 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
921 </dt>
922 <dd>
923 <p>
924 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
925 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
926 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
927 are Unmerged (<tt>U</tt>), are
928 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
929 Any combination of the filter characters (including none) can be used.
930 When <tt>*</tt> (All-or-none) is added to the combination, all
931 paths are selected if there is any file that matches
932 other criteria in the comparison; if there is no file
933 that matches other criteria, nothing is selected.
934 </p>
935 </dd>
937 -S<string>
938 </dt>
939 <dd>
940 <p>
941 Look for differences that introduce or remove an instance of
942 <string>. Note that this is different than the string simply
943 appearing in diff output; see the <em>pickaxe</em> entry in
945 </p>
946 </dd>
948 -G<regex>
949 </dt>
950 <dd>
951 <p>
952 Look for differences whose added or removed line matches
953 the given <regex>.
954 </p>
955 </dd>
957 --pickaxe-all
958 </dt>
959 <dd>
960 <p>
961 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
962 changeset, not just the files that contain the change
963 in <string>.
964 </p>
965 </dd>
967 --pickaxe-regex
968 </dt>
969 <dd>
970 <p>
971 Make the <string> not a plain string but an extended POSIX
972 regex to match.
973 </p>
974 </dd>
976 -O<orderfile>
977 </dt>
978 <dd>
979 <p>
980 Output the patch in the order specified in the
981 <orderfile>, which has one shell glob pattern per line.
982 </p>
983 </dd>
985 -R
986 </dt>
987 <dd>
988 <p>
989 Swap two inputs; that is, show differences from index or
990 on-disk file to tree contents.
991 </p>
992 </dd>
994 --relative[=<path>]
995 </dt>
996 <dd>
997 <p>
998 When run from a subdirectory of the project, it can be
999 told to exclude changes outside the directory and show
1000 pathnames relative to it with this option. When you are
1001 not in a subdirectory (e.g. in a bare repository), you
1002 can name which subdirectory to make the output relative
1003 to by giving a <path> as an argument.
1004 </p>
1005 </dd>
1007 -a
1008 </dt>
1010 --text
1011 </dt>
1012 <dd>
1013 <p>
1014 Treat all files as text.
1015 </p>
1016 </dd>
1018 --ignore-space-at-eol
1019 </dt>
1020 <dd>
1021 <p>
1022 Ignore changes in whitespace at EOL.
1023 </p>
1024 </dd>
1026 -b
1027 </dt>
1029 --ignore-space-change
1030 </dt>
1031 <dd>
1032 <p>
1033 Ignore changes in amount of whitespace. This ignores whitespace
1034 at line end, and considers all other sequences of one or
1035 more whitespace characters to be equivalent.
1036 </p>
1037 </dd>
1039 -w
1040 </dt>
1042 --ignore-all-space
1043 </dt>
1044 <dd>
1045 <p>
1046 Ignore whitespace when comparing lines. This ignores
1047 differences even if one line has whitespace where the other
1048 line has none.
1049 </p>
1050 </dd>
1052 --inter-hunk-context=<lines>
1053 </dt>
1054 <dd>
1055 <p>
1056 Show the context between diff hunks, up to the specified number
1057 of lines, thereby fusing hunks that are close to each other.
1058 </p>
1059 </dd>
1061 --exit-code
1062 </dt>
1063 <dd>
1064 <p>
1065 Make the program exit with codes similar to diff(1).
1066 That is, it exits with 1 if there were differences and
1067 0 means no differences.
1068 </p>
1069 </dd>
1071 --quiet
1072 </dt>
1073 <dd>
1074 <p>
1075 Disable all output of the program. Implies <tt>--exit-code</tt>.
1076 </p>
1077 </dd>
1079 --ext-diff
1080 </dt>
1081 <dd>
1082 <p>
1083 Allow an external diff helper to be executed. If you set an
1086 </p>
1087 </dd>
1089 --no-ext-diff
1090 </dt>
1091 <dd>
1092 <p>
1093 Disallow external diff drivers.
1094 </p>
1095 </dd>
1097 --ignore-submodules[=<when>]
1098 </dt>
1099 <dd>
1100 <p>
1101 Ignore changes to submodules in the diff generation. <when> can be
1104 untracked or modified files or its HEAD differs from the commit recorded
1105 in the superproject and can be used to override any settings of the
1106 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1108 contain untracked content (but they are still scanned for modified
1110 only changes to the commits stored in the superproject are shown (this was
1112 </p>
1113 </dd>
1115 --src-prefix=<prefix>
1116 </dt>
1117 <dd>
1118 <p>
1120 </p>
1121 </dd>
1123 --dst-prefix=<prefix>
1124 </dt>
1125 <dd>
1126 <p>
1128 </p>
1129 </dd>
1131 --no-prefix
1132 </dt>
1133 <dd>
1134 <p>
1135 Do not show any source or destination prefix.
1136 </p>
1137 </dd>
1138 </dl></div>
1143 <path>…
1144 </dt>
1145 <dd>
1146 <p>
1147 The <paths> parameters, when given, are used to limit
1148 the diff to the named paths (you can give directory
1149 names and get diff for all files under them).
1150 </p>
1151 </dd>
1152 </dl></div>
1153 </div>
1159 compared differs:</p></div>
1162 git-diff-index <tree-ish>
1163 </dt>
1164 <dd>
1165 <p>
1166 compares the <tree-ish> and the files on the filesystem.
1167 </p>
1168 </dd>
1170 git-diff-index --cached <tree-ish>
1171 </dt>
1172 <dd>
1173 <p>
1174 compares the <tree-ish> and the index.
1175 </p>
1176 </dd>
1178 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1179 </dt>
1180 <dd>
1181 <p>
1182 compares the trees named by the two arguments.
1183 </p>
1184 </dd>
1186 git-diff-files [<pattern>…]
1187 </dt>
1188 <dd>
1189 <p>
1190 compares the index and the files on the filesystem.
1191 </p>
1192 </dd>
1193 </dl></div>
1194 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1195 what is being compared. After that, all the commands print one output
1196 line per changed file.</p></div>
1200 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1201 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1202 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1203 create :000000 100644 0000000... 1234567... A file4
1204 delete :100644 000000 1234567... 0000000... D file5
1205 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1206 </div></div>
1209 <li>
1210 <p>
1211 a colon.
1212 </p>
1213 </li>
1214 <li>
1215 <p>
1217 </p>
1218 </li>
1219 <li>
1220 <p>
1221 a space.
1222 </p>
1223 </li>
1224 <li>
1225 <p>
1227 </p>
1228 </li>
1229 <li>
1230 <p>
1231 a space.
1232 </p>
1233 </li>
1234 <li>
1235 <p>
1237 </p>
1238 </li>
1239 <li>
1240 <p>
1241 a space.
1242 </p>
1243 </li>
1244 <li>
1245 <p>
1247 </p>
1248 </li>
1249 <li>
1250 <p>
1251 a space.
1252 </p>
1253 </li>
1254 <li>
1255 <p>
1257 </p>
1258 </li>
1259 <li>
1260 <p>
1261 a tab or a NUL when <em>-z</em> option is used.
1262 </p>
1263 </li>
1264 <li>
1265 <p>
1267 </p>
1268 </li>
1269 <li>
1270 <p>
1271 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1272 </p>
1273 </li>
1274 <li>
1275 <p>
1277 </p>
1278 </li>
1279 <li>
1280 <p>
1281 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1282 </p>
1283 </li>
1284 </ol></div>
1287 <li>
1288 <p>
1289 A: addition of a file
1290 </p>
1291 </li>
1292 <li>
1293 <p>
1294 C: copy of a file into a new one
1295 </p>
1296 </li>
1297 <li>
1298 <p>
1299 D: deletion of a file
1300 </p>
1301 </li>
1302 <li>
1303 <p>
1304 M: modification of the contents or mode of a file
1305 </p>
1306 </li>
1307 <li>
1308 <p>
1309 R: renaming of a file
1310 </p>
1311 </li>
1312 <li>
1313 <p>
1314 T: change in the type of the file
1315 </p>
1316 </li>
1317 <li>
1318 <p>
1319 U: file is unmerged (you must complete the merge before it can
1320 be committed)
1321 </p>
1322 </li>
1323 <li>
1324 <p>
1326 </p>
1327 </li>
1328 </ul></div>
1330 percentage of similarity between the source and target of the move or
1331 copy), and are the only ones to be so.</p></div>
1332 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1333 and it is out of sync with the index.</p></div>
1337 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1338 </div></div>
1339 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1340 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1341 respectively.</p></div>
1342 </div>
1346 can take <em>-c</em> or <em>--cc</em> option
1347 to generate diff output also for merge commits. The output differs
1348 from the format described above in the following way:</p></div>
1350 <li>
1351 <p>
1352 there is a colon for each parent
1353 </p>
1354 </li>
1355 <li>
1356 <p>
1358 </p>
1359 </li>
1360 <li>
1361 <p>
1362 status is concatenated status characters for each parent
1363 </p>
1364 </li>
1365 <li>
1366 <p>
1368 </p>
1369 </li>
1370 <li>
1371 <p>
1373 </p>
1374 </li>
1375 </ol></div>
1379 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1380 </div></div>
1381 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1382 all parents.</p></div>
1383 </div>
1389 do not produce the output described above; instead they produce a
1390 patch file. You can customize the creation of such patches via the
1391 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1392 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1393 diff format:</p></div>
1395 <li>
1396 <p>
1398 </p>
1401 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1402 </div></div>
1403 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1404 involved. Especially, even for a creation or a deletion,
1405 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1406 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1407 name of the source file of the rename/copy and the name of
1408 the file that rename/copy produces, respectively.</p></div>
1409 </li>
1410 <li>
1411 <p>
1412 It is followed by one or more extended header lines:
1413 </p>
1416 <pre><tt>old mode <mode>
1417 new mode <mode>
1418 deleted file mode <mode>
1419 new file mode <mode>
1420 copy from <path>
1421 copy to <path>
1422 rename from <path>
1423 rename to <path>
1424 similarity index <number>
1425 dissimilarity index <number>
1426 index <hash>..<hash> <mode></tt></pre>
1427 </div></div>
1428 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1429 and file permission bits.</p></div>
1430 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1432 the dissimilarity index is the percentage of changed lines. It
1433 is a rounded down integer, followed by a percent sign. The
1434 similarity index value of 100% is thus reserved for two equal
1435 files, while 100% dissimilarity means that no line from the old
1436 file made it into the new one.</p></div>
1437 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1438 The <mode> is included if the file mode does not change; otherwise,
1439 separate lines indicate the old and the new mode.</p></div>
1440 </li>
1441 <li>
1442 <p>
1443 TAB, LF, double quote and backslash characters in pathnames
1445 If there is need for such substitution then the whole
1446 pathname is put in double quotes.
1447 </p>
1448 </li>
1449 <li>
1450 <p>
1453 It is incorrect to apply each change to each file sequentially. For
1454 example, this patch will swap a and b:
1455 </p>
1458 <pre><tt>diff --git a/a b/b
1459 rename from a
1460 rename to b
1461 diff --git a/b b/a
1462 rename from b
1463 rename to a</tt></pre>
1464 </div></div>
1465 </li>
1466 </ol></div>
1467 </div>
1470 <div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
1472 with "git log -p", this is the default format; you can force showing
1477 <pre><tt>diff --combined describe.c
1478 index fabadb8,cc95eb0..4866510
1479 --- a/describe.c
1480 +++ b/describe.c
1483 }
1485 - static void describe(char *arg)
1486 -static void describe(struct commit *cmit, int last_one)
1487 ++static void describe(char *arg, int last_one)
1488 {
1489 + unsigned char sha1[20];
1490 + struct commit *cmit;
1491 struct commit_list *list;
1492 static int initialized = 0;
1493 struct commit_name *n;
1496 + usage(describe_usage);
1497 + cmit = lookup_commit_reference(sha1);
1498 + if (!cmit)
1499 + usage(describe_usage);
1500 +
1501 if (!initialized) {
1502 initialized = 1;
1503 for_each_ref(get_name);</tt></pre>
1504 </div></div>
1506 <li>
1507 <p>
1508 It is preceded with a "git diff" header, that looks like
1510 </p>
1514 </div></div>
1519 </div></div>
1520 </li>
1521 <li>
1522 <p>
1523 It is followed by one or more extended header lines
1524 (this example shows a merge with two parents):
1525 </p>
1532 </div></div>
1533 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1535 information about detected contents movement (renames and
1536 copying detection) are designed to work with diff of two
1538 </li>
1539 <li>
1540 <p>
1541 It is followed by two-line from-file/to-file header
1542 </p>
1545 <pre><tt>--- a/file
1546 +++ b/file</tt></pre>
1547 </div></div>
1550 files.</p></div>
1551 </li>
1552 <li>
1553 <p>
1554 Chunk header format is modified to prevent people from
1556 was created for review of merge commit changes, and was not
1557 meant for apply. The change is similar to the change in the
1559 </p>
1562 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1563 </div></div>
1565 header for combined diff format.</p></div>
1566 </li>
1567 </ol></div>
1569 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
1571 compares two or more files file1, file2,… with one file X, and
1572 shows how X differs from each of fileN. One column for each of
1573 fileN is prepended to the output line to note how X’s line is
1574 different from it.</p></div>
1575 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1577 in the column N means that the line appears in the result,
1578 and fileN does not have that line (in other words, the line was
1579 added, from the point of view of that parent).</p></div>
1583 in either file1 nor file2). Also eight other lines are the same
1585 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1586 merge commit with the merge result (i.e. file1..fileN are the
1588 two unresolved merge parents with the working tree file
1591 </div>
1594 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1596 output. These options can be combined with other options, such as
1598 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1599 formats the pathnames compactly by combining common prefix and suffix of
1605 </div></div>
1606 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1608 like this:</p></div>
1613 </div></div>
1616 <li>
1617 <p>
1618 the number of added lines;
1619 </p>
1620 </li>
1621 <li>
1622 <p>
1623 a tab;
1624 </p>
1625 </li>
1626 <li>
1627 <p>
1628 the number of deleted lines;
1629 </p>
1630 </li>
1631 <li>
1632 <p>
1633 a tab;
1634 </p>
1635 </li>
1636 <li>
1637 <p>
1638 pathname (possibly with rename/copy information);
1639 </p>
1640 </li>
1641 <li>
1642 <p>
1643 a newline.
1644 </p>
1645 </li>
1646 </ol></div>
1647 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1652 </div></div>
1655 <li>
1656 <p>
1657 the number of added lines;
1658 </p>
1659 </li>
1660 <li>
1661 <p>
1662 a tab;
1663 </p>
1664 </li>
1665 <li>
1666 <p>
1667 the number of deleted lines;
1668 </p>
1669 </li>
1670 <li>
1671 <p>
1672 a tab;
1673 </p>
1674 </li>
1675 <li>
1676 <p>
1677 a NUL (only exists if renamed/copied);
1678 </p>
1679 </li>
1680 <li>
1681 <p>
1682 pathname in preimage;
1683 </p>
1684 </li>
1685 <li>
1686 <p>
1687 a NUL (only exists if renamed/copied);
1688 </p>
1689 </li>
1690 <li>
1691 <p>
1692 pathname in postimage (only exists if renamed/copied);
1693 </p>
1694 </li>
1695 <li>
1696 <p>
1697 a NUL.
1698 </p>
1699 </li>
1700 </ol></div>
1701 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1702 scripts that read the output to tell if the current record being read is
1703 a single-path record or a rename/copy record without reading ahead.
1706 </div>
1711 Various ways to check your working tree
1712 </dt>
1713 <dd>
1719 </div></div>
1721 <li>
1722 <p>
1723 Changes in the working tree not yet staged for the next commit.
1724 </p>
1725 </li>
1726 <li>
1727 <p>
1728 Changes between the index and your last commit; what you
1730 </p>
1731 </li>
1732 <li>
1733 <p>
1734 Changes in the working tree since your last commit; what you
1735 would be committing if you run "git commit -a"
1736 </p>
1737 </li>
1738 </ol></div>
1739 </dd>
1741 Comparing with arbitrary commits
1742 </dt>
1743 <dd>
1749 </div></div>
1751 <li>
1752 <p>
1753 Instead of using the tip of the current branch, compare with the
1754 tip of "test" branch.
1755 </p>
1756 </li>
1757 <li>
1758 <p>
1759 Instead of comparing with the tip of "test" branch, compare with
1760 the tip of the current branch, but limit the comparison to the
1761 file "test".
1762 </p>
1763 </li>
1764 <li>
1765 <p>
1766 Compare the version before the last commit and the last commit.
1767 </p>
1768 </li>
1769 </ol></div>
1770 </dd>
1772 Comparing branches
1773 </dt>
1774 <dd>
1780 </div></div>
1782 <li>
1783 <p>
1784 Changes between the tips of the topic and the master branches.
1785 </p>
1786 </li>
1787 <li>
1788 <p>
1789 Same as above.
1790 </p>
1791 </li>
1792 <li>
1793 <p>
1794 Changes that occurred on the master branch since when the topic
1795 branch was started off it.
1796 </p>
1797 </li>
1798 </ol></div>
1799 </dd>
1801 Limiting the diff output
1802 </dt>
1803 <dd>
1809 </div></div>
1811 <li>
1812 <p>
1813 Show only modification, rename and copy, but not addition
1814 nor deletion.
1815 </p>
1816 </li>
1817 <li>
1818 <p>
1819 Show only names and the nature of change, but not actual
1820 diff output.
1821 </p>
1822 </li>
1823 <li>
1824 <p>
1825 Limit diff output to named subtrees.
1826 </p>
1827 </li>
1828 </ol></div>
1829 </dd>
1831 Munging the diff output
1832 </dt>
1833 <dd>
1838 </div></div>
1840 <li>
1841 <p>
1842 Spend extra cycles to find renames, copies and complete
1843 rewrites (very expensive).
1844 </p>
1845 </li>
1846 <li>
1847 <p>
1848 Output diff in reverse.
1849 </p>
1850 </li>
1851 </ol></div>
1852 </dd>
1853 </dl></div>
1854 </div>
1863 </div>
1866 <div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
1867 </div>
1870 <div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
1871 </div>
1875 </div>
1879 </div>
1880 </div>
1881 </body>
1882 </html>