| blob | 869bd376c353e786dec5328766bebad81657c18d |
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 </dd>
619 </dt>
620 <dd>
621 <p>
623 </p>
624 </dd>
626 --summary
627 </dt>
628 <dd>
629 <p>
630 Output a condensed summary of extended header information
631 such as creations, renames and mode changes.
632 </p>
633 </dd>
635 --patch-with-stat
636 </dt>
637 <dd>
638 <p>
640 </p>
641 </dd>
643 -z
644 </dt>
645 <dd>
646 <p>
647 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
648 given, do not munge pathnames and use NULs as output field terminators.
649 </p>
650 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
652 respectively, and the pathname will be enclosed in double quotes if
653 any of those replacements occurred.</p></div>
654 </dd>
656 --name-only
657 </dt>
658 <dd>
659 <p>
660 Show only names of changed files.
661 </p>
662 </dd>
664 --name-status
665 </dt>
666 <dd>
667 <p>
668 Show only names and status of changed files. See the description
669 of the <tt>--diff-filter</tt> option on what the status letters mean.
670 </p>
671 </dd>
673 --submodule[=<format>]
674 </dt>
675 <dd>
676 <p>
677 Chose the output format for submodule differences. <format> can be one of
678 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
679 is used when this option is not given. <em>log</em> is the default value for this
680 option and lists the commits in that commit range like the <em>summary</em>
682 </p>
683 </dd>
685 --color[=<when>]
686 </dt>
687 <dd>
688 <p>
689 Show colored diff.
690 The value must be always (the default), never, or auto.
691 </p>
692 </dd>
694 --no-color
695 </dt>
696 <dd>
697 <p>
698 Turn off colored diff, even when the configuration file
699 gives the default to color output.
700 Same as <tt>--color=never</tt>.
701 </p>
702 </dd>
704 --word-diff[=<mode>]
705 </dt>
706 <dd>
707 <p>
708 Show a word diff, using the <mode> to delimit changed words.
709 By default, words are delimited by whitespace; see
710 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
711 must be one of:
712 </p>
715 color
716 </dt>
717 <dd>
718 <p>
719 Highlight changed words using only colors. Implies <tt>--color</tt>.
720 </p>
721 </dd>
723 plain
724 </dt>
725 <dd>
726 <p>
727 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
728 attempts to escape the delimiters if they appear in the input,
729 so the output may be ambiguous.
730 </p>
731 </dd>
733 porcelain
734 </dt>
735 <dd>
736 <p>
737 Use a special line-based format intended for script
738 consumption. Added/removed/unchanged runs are printed in the
739 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
740 character at the beginning of the line and extending to the
741 end of the line. Newlines in the input are represented by a
742 tilde <tt>~</tt> on a line of its own.
743 </p>
744 </dd>
746 none
747 </dt>
748 <dd>
749 <p>
750 Disable word diff again.
751 </p>
752 </dd>
753 </dl></div>
755 highlight the changed parts in all modes if enabled.</p></div>
756 </dd>
758 --word-diff-regex=<regex>
759 </dt>
760 <dd>
761 <p>
762 Use <regex> to decide what a word is, instead of considering
763 runs of non-whitespace to be a word. Also implies
764 <tt>--word-diff</tt> unless it was already enabled.
765 </p>
767 <regex> is considered a word. Anything between these matches is
768 considered whitespace and ignored(!) for the purposes of finding
769 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
770 expression to make sure that it matches all non-whitespace characters.
771 A match that contains a newline is silently truncated(!) at the
772 newline.</p></div>
773 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
774 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
775 overrides any diff driver or configuration setting. Diff drivers
776 override configuration settings.</p></div>
777 </dd>
779 --color-words[=<regex>]
780 </dt>
781 <dd>
782 <p>
783 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
784 specified) <tt>--word-diff-regex=<regex></tt>.
785 </p>
786 </dd>
788 --no-renames
789 </dt>
790 <dd>
791 <p>
792 Turn off rename detection, even when the configuration
793 file gives the default to do so.
794 </p>
795 </dd>
797 --check
798 </dt>
799 <dd>
800 <p>
801 Warn if changes introduce trailing whitespace
802 or an indent that uses a space before a tab. Exits with
803 non-zero status if problems are found. Not compatible with
804 --exit-code.
805 </p>
806 </dd>
808 --full-index
809 </dt>
810 <dd>
811 <p>
812 Instead of the first handful of characters, show the full
814 line when generating patch format output.
815 </p>
816 </dd>
818 --binary
819 </dt>
820 <dd>
821 <p>
822 In addition to <tt>--full-index</tt>, output a binary diff that
823 can be applied with <tt>git-apply</tt>.
824 </p>
825 </dd>
827 --abbrev[=<n>]
828 </dt>
829 <dd>
830 <p>
831 Instead of showing the full 40-byte hexadecimal object
832 name in diff-raw format output and diff-tree header
833 lines, show only a partial prefix. This is
834 independent of the <tt>--full-index</tt> option above, which controls
835 the diff-patch output format. Non default number of
836 digits can be specified with <tt>--abbrev=<n></tt>.
837 </p>
838 </dd>
840 -B[<n>][/<m>]
841 </dt>
843 --break-rewrites[=[<n>][/<m>]]
844 </dt>
845 <dd>
846 <p>
847 Break complete rewrite changes into pairs of delete and
848 create. This serves two purposes:
849 </p>
851 not as a series of deletion and insertion mixed together with a very
852 few lines that happen to match textually as the context, but as a
853 single deletion of everything old followed by a single insertion of
854 everything new, and the number <tt>m</tt> controls this aspect of the -B
855 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
856 original should remain in the result for git to consider it a total
857 rewrite (i.e. otherwise the resulting patch will be a series of
858 deletion and insertion mixed together with context lines).</p></div>
860 source of a rename (usually -M only considers a file that disappeared
861 as the source of a rename), and the number <tt>n</tt> controls this aspect of
862 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
863 addition and deletion compared to 20% or more of the file’s size are
864 eligible for being picked up as a possible source of a rename to
865 another file.</p></div>
866 </dd>
868 -M[<n>]
869 </dt>
871 --find-renames[=<n>]
872 </dt>
873 <dd>
874 <p>
875 Detect renames.
876 If <tt>n</tt> is specified, it is a is a threshold on the similarity
877 index (i.e. amount of addition/deletions compared to the
878 file’s size). For example, <tt>-M90%</tt> means git should consider a
879 delete/add pair to be a rename if more than 90% of the file
880 hasn’t changed.
881 </p>
882 </dd>
884 -C[<n>]
885 </dt>
887 --find-copies[=<n>]
888 </dt>
889 <dd>
890 <p>
891 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
892 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
893 </p>
894 </dd>
896 --find-copies-harder
897 </dt>
898 <dd>
899 <p>
900 For performance reasons, by default, <tt>-C</tt> option finds copies only
901 if the original file of the copy was modified in the same
902 changeset. This flag makes the command
903 inspect unmodified files as candidates for the source of
904 copy. This is a very expensive operation for large
905 projects, so use it with caution. Giving more than one
906 <tt>-C</tt> option has the same effect.
907 </p>
908 </dd>
910 -l<num>
911 </dt>
912 <dd>
913 <p>
914 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
915 is the number of potential rename/copy targets. This
916 option prevents rename/copy detection from running if
917 the number of rename/copy targets exceeds the specified
918 number.
919 </p>
920 </dd>
922 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
923 </dt>
924 <dd>
925 <p>
926 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
927 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
928 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
929 are Unmerged (<tt>U</tt>), are
930 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
931 Any combination of the filter characters (including none) can be used.
932 When <tt>*</tt> (All-or-none) is added to the combination, all
933 paths are selected if there is any file that matches
934 other criteria in the comparison; if there is no file
935 that matches other criteria, nothing is selected.
936 </p>
937 </dd>
939 -S<string>
940 </dt>
941 <dd>
942 <p>
943 Look for differences that introduce or remove an instance of
944 <string>. Note that this is different than the string simply
945 appearing in diff output; see the <em>pickaxe</em> entry in
947 </p>
948 </dd>
950 -G<regex>
951 </dt>
952 <dd>
953 <p>
954 Look for differences whose added or removed line matches
955 the given <regex>.
956 </p>
957 </dd>
959 --pickaxe-all
960 </dt>
961 <dd>
962 <p>
963 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
964 changeset, not just the files that contain the change
965 in <string>.
966 </p>
967 </dd>
969 --pickaxe-regex
970 </dt>
971 <dd>
972 <p>
973 Make the <string> not a plain string but an extended POSIX
974 regex to match.
975 </p>
976 </dd>
978 -O<orderfile>
979 </dt>
980 <dd>
981 <p>
982 Output the patch in the order specified in the
983 <orderfile>, which has one shell glob pattern per line.
984 </p>
985 </dd>
987 -R
988 </dt>
989 <dd>
990 <p>
991 Swap two inputs; that is, show differences from index or
992 on-disk file to tree contents.
993 </p>
994 </dd>
996 --relative[=<path>]
997 </dt>
998 <dd>
999 <p>
1000 When run from a subdirectory of the project, it can be
1001 told to exclude changes outside the directory and show
1002 pathnames relative to it with this option. When you are
1003 not in a subdirectory (e.g. in a bare repository), you
1004 can name which subdirectory to make the output relative
1005 to by giving a <path> as an argument.
1006 </p>
1007 </dd>
1009 -a
1010 </dt>
1012 --text
1013 </dt>
1014 <dd>
1015 <p>
1016 Treat all files as text.
1017 </p>
1018 </dd>
1020 --ignore-space-at-eol
1021 </dt>
1022 <dd>
1023 <p>
1024 Ignore changes in whitespace at EOL.
1025 </p>
1026 </dd>
1028 -b
1029 </dt>
1031 --ignore-space-change
1032 </dt>
1033 <dd>
1034 <p>
1035 Ignore changes in amount of whitespace. This ignores whitespace
1036 at line end, and considers all other sequences of one or
1037 more whitespace characters to be equivalent.
1038 </p>
1039 </dd>
1041 -w
1042 </dt>
1044 --ignore-all-space
1045 </dt>
1046 <dd>
1047 <p>
1048 Ignore whitespace when comparing lines. This ignores
1049 differences even if one line has whitespace where the other
1050 line has none.
1051 </p>
1052 </dd>
1054 --inter-hunk-context=<lines>
1055 </dt>
1056 <dd>
1057 <p>
1058 Show the context between diff hunks, up to the specified number
1059 of lines, thereby fusing hunks that are close to each other.
1060 </p>
1061 </dd>
1063 --exit-code
1064 </dt>
1065 <dd>
1066 <p>
1067 Make the program exit with codes similar to diff(1).
1068 That is, it exits with 1 if there were differences and
1069 0 means no differences.
1070 </p>
1071 </dd>
1073 --quiet
1074 </dt>
1075 <dd>
1076 <p>
1077 Disable all output of the program. Implies <tt>--exit-code</tt>.
1078 </p>
1079 </dd>
1081 --ext-diff
1082 </dt>
1083 <dd>
1084 <p>
1085 Allow an external diff helper to be executed. If you set an
1088 </p>
1089 </dd>
1091 --no-ext-diff
1092 </dt>
1093 <dd>
1094 <p>
1095 Disallow external diff drivers.
1096 </p>
1097 </dd>
1099 --ignore-submodules[=<when>]
1100 </dt>
1101 <dd>
1102 <p>
1103 Ignore changes to submodules in the diff generation. <when> can be
1106 untracked or modified files or its HEAD differs from the commit recorded
1107 in the superproject and can be used to override any settings of the
1108 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1110 contain untracked content (but they are still scanned for modified
1112 only changes to the commits stored in the superproject are shown (this was
1114 </p>
1115 </dd>
1117 --src-prefix=<prefix>
1118 </dt>
1119 <dd>
1120 <p>
1122 </p>
1123 </dd>
1125 --dst-prefix=<prefix>
1126 </dt>
1127 <dd>
1128 <p>
1130 </p>
1131 </dd>
1133 --no-prefix
1134 </dt>
1135 <dd>
1136 <p>
1137 Do not show any source or destination prefix.
1138 </p>
1139 </dd>
1140 </dl></div>
1145 <path>…
1146 </dt>
1147 <dd>
1148 <p>
1149 The <paths> parameters, when given, are used to limit
1150 the diff to the named paths (you can give directory
1151 names and get diff for all files under them).
1152 </p>
1153 </dd>
1154 </dl></div>
1155 </div>
1161 compared differs:</p></div>
1164 git-diff-index <tree-ish>
1165 </dt>
1166 <dd>
1167 <p>
1168 compares the <tree-ish> and the files on the filesystem.
1169 </p>
1170 </dd>
1172 git-diff-index --cached <tree-ish>
1173 </dt>
1174 <dd>
1175 <p>
1176 compares the <tree-ish> and the index.
1177 </p>
1178 </dd>
1180 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1181 </dt>
1182 <dd>
1183 <p>
1184 compares the trees named by the two arguments.
1185 </p>
1186 </dd>
1188 git-diff-files [<pattern>…]
1189 </dt>
1190 <dd>
1191 <p>
1192 compares the index and the files on the filesystem.
1193 </p>
1194 </dd>
1195 </dl></div>
1196 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1197 what is being compared. After that, all the commands print one output
1198 line per changed file.</p></div>
1202 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1203 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1204 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1205 create :000000 100644 0000000... 1234567... A file4
1206 delete :100644 000000 1234567... 0000000... D file5
1207 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1208 </div></div>
1211 <li>
1212 <p>
1213 a colon.
1214 </p>
1215 </li>
1216 <li>
1217 <p>
1219 </p>
1220 </li>
1221 <li>
1222 <p>
1223 a space.
1224 </p>
1225 </li>
1226 <li>
1227 <p>
1229 </p>
1230 </li>
1231 <li>
1232 <p>
1233 a space.
1234 </p>
1235 </li>
1236 <li>
1237 <p>
1239 </p>
1240 </li>
1241 <li>
1242 <p>
1243 a space.
1244 </p>
1245 </li>
1246 <li>
1247 <p>
1249 </p>
1250 </li>
1251 <li>
1252 <p>
1253 a space.
1254 </p>
1255 </li>
1256 <li>
1257 <p>
1259 </p>
1260 </li>
1261 <li>
1262 <p>
1263 a tab or a NUL when <em>-z</em> option is used.
1264 </p>
1265 </li>
1266 <li>
1267 <p>
1269 </p>
1270 </li>
1271 <li>
1272 <p>
1273 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1274 </p>
1275 </li>
1276 <li>
1277 <p>
1279 </p>
1280 </li>
1281 <li>
1282 <p>
1283 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1284 </p>
1285 </li>
1286 </ol></div>
1289 <li>
1290 <p>
1291 A: addition of a file
1292 </p>
1293 </li>
1294 <li>
1295 <p>
1296 C: copy of a file into a new one
1297 </p>
1298 </li>
1299 <li>
1300 <p>
1301 D: deletion of a file
1302 </p>
1303 </li>
1304 <li>
1305 <p>
1306 M: modification of the contents or mode of a file
1307 </p>
1308 </li>
1309 <li>
1310 <p>
1311 R: renaming of a file
1312 </p>
1313 </li>
1314 <li>
1315 <p>
1316 T: change in the type of the file
1317 </p>
1318 </li>
1319 <li>
1320 <p>
1321 U: file is unmerged (you must complete the merge before it can
1322 be committed)
1323 </p>
1324 </li>
1325 <li>
1326 <p>
1328 </p>
1329 </li>
1330 </ul></div>
1332 percentage of similarity between the source and target of the move or
1333 copy), and are the only ones to be so.</p></div>
1334 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1335 and it is out of sync with the index.</p></div>
1339 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1340 </div></div>
1341 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1342 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1343 respectively.</p></div>
1344 </div>
1348 can take <em>-c</em> or <em>--cc</em> option
1349 to generate diff output also for merge commits. The output differs
1350 from the format described above in the following way:</p></div>
1352 <li>
1353 <p>
1354 there is a colon for each parent
1355 </p>
1356 </li>
1357 <li>
1358 <p>
1360 </p>
1361 </li>
1362 <li>
1363 <p>
1364 status is concatenated status characters for each parent
1365 </p>
1366 </li>
1367 <li>
1368 <p>
1370 </p>
1371 </li>
1372 <li>
1373 <p>
1375 </p>
1376 </li>
1377 </ol></div>
1381 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1382 </div></div>
1383 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1384 all parents.</p></div>
1385 </div>
1391 do not produce the output described above; instead they produce a
1392 patch file. You can customize the creation of such patches via the
1393 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1394 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1395 diff format:</p></div>
1397 <li>
1398 <p>
1400 </p>
1403 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1404 </div></div>
1405 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1406 involved. Especially, even for a creation or a deletion,
1407 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1408 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1409 name of the source file of the rename/copy and the name of
1410 the file that rename/copy produces, respectively.</p></div>
1411 </li>
1412 <li>
1413 <p>
1414 It is followed by one or more extended header lines:
1415 </p>
1418 <pre><tt>old mode <mode>
1419 new mode <mode>
1420 deleted file mode <mode>
1421 new file mode <mode>
1422 copy from <path>
1423 copy to <path>
1424 rename from <path>
1425 rename to <path>
1426 similarity index <number>
1427 dissimilarity index <number>
1428 index <hash>..<hash> <mode></tt></pre>
1429 </div></div>
1430 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1431 and file permission bits.</p></div>
1432 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1434 the dissimilarity index is the percentage of changed lines. It
1435 is a rounded down integer, followed by a percent sign. The
1436 similarity index value of 100% is thus reserved for two equal
1437 files, while 100% dissimilarity means that no line from the old
1438 file made it into the new one.</p></div>
1439 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1440 The <mode> is included if the file mode does not change; otherwise,
1441 separate lines indicate the old and the new mode.</p></div>
1442 </li>
1443 <li>
1444 <p>
1445 TAB, LF, double quote and backslash characters in pathnames
1447 If there is need for such substitution then the whole
1448 pathname is put in double quotes.
1449 </p>
1450 </li>
1451 <li>
1452 <p>
1455 It is incorrect to apply each change to each file sequentially. For
1456 example, this patch will swap a and b:
1457 </p>
1460 <pre><tt>diff --git a/a b/b
1461 rename from a
1462 rename to b
1463 diff --git a/b b/a
1464 rename from b
1465 rename to a</tt></pre>
1466 </div></div>
1467 </li>
1468 </ol></div>
1469 </div>
1472 <div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
1474 with "git log -p", this is the default format; you can force showing
1479 <pre><tt>diff --combined describe.c
1480 index fabadb8,cc95eb0..4866510
1481 --- a/describe.c
1482 +++ b/describe.c
1485 }
1487 - static void describe(char *arg)
1488 -static void describe(struct commit *cmit, int last_one)
1489 ++static void describe(char *arg, int last_one)
1490 {
1491 + unsigned char sha1[20];
1492 + struct commit *cmit;
1493 struct commit_list *list;
1494 static int initialized = 0;
1495 struct commit_name *n;
1498 + usage(describe_usage);
1499 + cmit = lookup_commit_reference(sha1);
1500 + if (!cmit)
1501 + usage(describe_usage);
1502 +
1503 if (!initialized) {
1504 initialized = 1;
1505 for_each_ref(get_name);</tt></pre>
1506 </div></div>
1508 <li>
1509 <p>
1510 It is preceded with a "git diff" header, that looks like
1512 </p>
1516 </div></div>
1521 </div></div>
1522 </li>
1523 <li>
1524 <p>
1525 It is followed by one or more extended header lines
1526 (this example shows a merge with two parents):
1527 </p>
1534 </div></div>
1535 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1537 information about detected contents movement (renames and
1538 copying detection) are designed to work with diff of two
1540 </li>
1541 <li>
1542 <p>
1543 It is followed by two-line from-file/to-file header
1544 </p>
1547 <pre><tt>--- a/file
1548 +++ b/file</tt></pre>
1549 </div></div>
1552 files.</p></div>
1553 </li>
1554 <li>
1555 <p>
1556 Chunk header format is modified to prevent people from
1558 was created for review of merge commit changes, and was not
1559 meant for apply. The change is similar to the change in the
1561 </p>
1564 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1565 </div></div>
1567 header for combined diff format.</p></div>
1568 </li>
1569 </ol></div>
1571 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
1573 compares two or more files file1, file2,… with one file X, and
1574 shows how X differs from each of fileN. One column for each of
1575 fileN is prepended to the output line to note how X’s line is
1576 different from it.</p></div>
1577 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1579 in the column N means that the line appears in the result,
1580 and fileN does not have that line (in other words, the line was
1581 added, from the point of view of that parent).</p></div>
1585 in either file1 nor file2). Also eight other lines are the same
1587 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1588 merge commit with the merge result (i.e. file1..fileN are the
1590 two unresolved merge parents with the working tree file
1593 </div>
1596 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1598 output. These options can be combined with other options, such as
1600 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1601 formats the pathnames compactly by combining common prefix and suffix of
1607 </div></div>
1608 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1610 like this:</p></div>
1615 </div></div>
1618 <li>
1619 <p>
1620 the number of added lines;
1621 </p>
1622 </li>
1623 <li>
1624 <p>
1625 a tab;
1626 </p>
1627 </li>
1628 <li>
1629 <p>
1630 the number of deleted lines;
1631 </p>
1632 </li>
1633 <li>
1634 <p>
1635 a tab;
1636 </p>
1637 </li>
1638 <li>
1639 <p>
1640 pathname (possibly with rename/copy information);
1641 </p>
1642 </li>
1643 <li>
1644 <p>
1645 a newline.
1646 </p>
1647 </li>
1648 </ol></div>
1649 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1654 </div></div>
1657 <li>
1658 <p>
1659 the number of added lines;
1660 </p>
1661 </li>
1662 <li>
1663 <p>
1664 a tab;
1665 </p>
1666 </li>
1667 <li>
1668 <p>
1669 the number of deleted lines;
1670 </p>
1671 </li>
1672 <li>
1673 <p>
1674 a tab;
1675 </p>
1676 </li>
1677 <li>
1678 <p>
1679 a NUL (only exists if renamed/copied);
1680 </p>
1681 </li>
1682 <li>
1683 <p>
1684 pathname in preimage;
1685 </p>
1686 </li>
1687 <li>
1688 <p>
1689 a NUL (only exists if renamed/copied);
1690 </p>
1691 </li>
1692 <li>
1693 <p>
1694 pathname in postimage (only exists if renamed/copied);
1695 </p>
1696 </li>
1697 <li>
1698 <p>
1699 a NUL.
1700 </p>
1701 </li>
1702 </ol></div>
1703 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1704 scripts that read the output to tell if the current record being read is
1705 a single-path record or a rename/copy record without reading ahead.
1708 </div>
1713 Various ways to check your working tree
1714 </dt>
1715 <dd>
1721 </div></div>
1723 <li>
1724 <p>
1725 Changes in the working tree not yet staged for the next commit.
1726 </p>
1727 </li>
1728 <li>
1729 <p>
1730 Changes between the index and your last commit; what you
1732 </p>
1733 </li>
1734 <li>
1735 <p>
1736 Changes in the working tree since your last commit; what you
1737 would be committing if you run "git commit -a"
1738 </p>
1739 </li>
1740 </ol></div>
1741 </dd>
1743 Comparing with arbitrary commits
1744 </dt>
1745 <dd>
1751 </div></div>
1753 <li>
1754 <p>
1755 Instead of using the tip of the current branch, compare with the
1756 tip of "test" branch.
1757 </p>
1758 </li>
1759 <li>
1760 <p>
1761 Instead of comparing with the tip of "test" branch, compare with
1762 the tip of the current branch, but limit the comparison to the
1763 file "test".
1764 </p>
1765 </li>
1766 <li>
1767 <p>
1768 Compare the version before the last commit and the last commit.
1769 </p>
1770 </li>
1771 </ol></div>
1772 </dd>
1774 Comparing branches
1775 </dt>
1776 <dd>
1782 </div></div>
1784 <li>
1785 <p>
1786 Changes between the tips of the topic and the master branches.
1787 </p>
1788 </li>
1789 <li>
1790 <p>
1791 Same as above.
1792 </p>
1793 </li>
1794 <li>
1795 <p>
1796 Changes that occurred on the master branch since when the topic
1797 branch was started off it.
1798 </p>
1799 </li>
1800 </ol></div>
1801 </dd>
1803 Limiting the diff output
1804 </dt>
1805 <dd>
1811 </div></div>
1813 <li>
1814 <p>
1815 Show only modification, rename and copy, but not addition
1816 nor deletion.
1817 </p>
1818 </li>
1819 <li>
1820 <p>
1821 Show only names and the nature of change, but not actual
1822 diff output.
1823 </p>
1824 </li>
1825 <li>
1826 <p>
1827 Limit diff output to named subtrees.
1828 </p>
1829 </li>
1830 </ol></div>
1831 </dd>
1833 Munging the diff output
1834 </dt>
1835 <dd>
1840 </div></div>
1842 <li>
1843 <p>
1844 Spend extra cycles to find renames, copies and complete
1845 rewrites (very expensive).
1846 </p>
1847 </li>
1848 <li>
1849 <p>
1850 Output diff in reverse.
1851 </p>
1852 </li>
1853 </ol></div>
1854 </dd>
1855 </dl></div>
1856 </div>
1865 </div>
1868 <div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
1869 </div>
1872 <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>
1873 </div>
1877 </div>
1881 </div>
1882 </div>
1883 </body>
1884 </html>