| blob | 71aaed8e9d688544f3b6117ed504d59a60cb0dfb |
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-index(1) Manual Page
407 </h1>
410 <p>git-diff-index -
411 Compares content and mode of blobs between the index and repository
412 </p>
413 </div>
414 </div>
417 <div class="paragraph"><p><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</p></div>
418 </div>
422 object with the content of the current index and, optionally
423 ignoring the stat state of the file on disk. When paths are
424 specified, compares only those named paths. Otherwise all
425 entries in the index are compared.</p></div>
426 </div>
431 -p
432 </dt>
434 -u
435 </dt>
437 --patch
438 </dt>
439 <dd>
440 <p>
441 Generate patch (see section on generating patches).
443 </p>
444 </dd>
447 </dt>
450 </dt>
451 <dd>
452 <p>
454 the usual three.
456 </p>
457 </dd>
459 --raw
460 </dt>
461 <dd>
462 <p>
463 Generate the raw format.
464 This is the default.
465 </p>
466 </dd>
468 --patch-with-raw
469 </dt>
470 <dd>
471 <p>
473 </p>
474 </dd>
476 --patience
477 </dt>
478 <dd>
479 <p>
480 Generate a diff using the "patience diff" algorithm.
481 </p>
482 </dd>
485 </dt>
486 <dd>
487 <p>
488 Generate a diffstat. You can override the default
490 The width of the filename part can be controlled by
491 giving another width to it separated by a comma.
492 </p>
493 </dd>
495 --numstat
496 </dt>
497 <dd>
498 <p>
500 deleted lines in decimal notation and pathname without
501 abbreviation, to make it more machine friendly. For
504 </p>
505 </dd>
507 --shortstat
508 </dt>
509 <dd>
510 <p>
512 number of modified files, as well as number of added and deleted
513 lines.
514 </p>
515 </dd>
518 </dt>
519 <dd>
520 <p>
521 Output the distribution of relative amount of changes (number of lines added or
522 removed) for each sub-directory. Directories with changes below
523 a cut-off percent (3% by default) are not shown. The cut-off percent
526 </p>
527 </dd>
530 </dt>
531 <dd>
532 <p>
534 </p>
535 </dd>
537 --summary
538 </dt>
539 <dd>
540 <p>
541 Output a condensed summary of extended header information
542 such as creations, renames and mode changes.
543 </p>
544 </dd>
546 --patch-with-stat
547 </dt>
548 <dd>
549 <p>
551 </p>
552 </dd>
554 -z
555 </dt>
556 <dd>
557 <p>
558 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
559 given, do not munge pathnames and use NULs as output field terminators.
560 </p>
561 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
563 respectively, and the pathname will be enclosed in double quotes if
564 any of those replacements occurred.</p></div>
565 </dd>
567 --name-only
568 </dt>
569 <dd>
570 <p>
571 Show only names of changed files.
572 </p>
573 </dd>
575 --name-status
576 </dt>
577 <dd>
578 <p>
579 Show only names and status of changed files. See the description
580 of the <tt>--diff-filter</tt> option on what the status letters mean.
581 </p>
582 </dd>
584 --submodule[=<format>]
585 </dt>
586 <dd>
587 <p>
588 Chose the output format for submodule differences. <format> can be one of
589 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
590 is used when this option is not given. <em>log</em> is the default value for this
591 option and lists the commits in that commit range like the <em>summary</em>
593 </p>
594 </dd>
596 --color[=<when>]
597 </dt>
598 <dd>
599 <p>
600 Show colored diff.
601 The value must be always (the default), never, or auto.
602 </p>
603 </dd>
605 --no-color
606 </dt>
607 <dd>
608 <p>
609 Turn off colored diff, even when the configuration file
610 gives the default to color output.
611 Same as <tt>--color=never</tt>.
612 </p>
613 </dd>
615 --word-diff[=<mode>]
616 </dt>
617 <dd>
618 <p>
619 Show a word diff, using the <mode> to delimit changed words.
620 By default, words are delimited by whitespace; see
621 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
622 must be one of:
623 </p>
626 color
627 </dt>
628 <dd>
629 <p>
630 Highlight changed words using only colors. Implies <tt>--color</tt>.
631 </p>
632 </dd>
634 plain
635 </dt>
636 <dd>
637 <p>
638 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
639 attempts to escape the delimiters if they appear in the input,
640 so the output may be ambiguous.
641 </p>
642 </dd>
644 porcelain
645 </dt>
646 <dd>
647 <p>
648 Use a special line-based format intended for script
649 consumption. Added/removed/unchanged runs are printed in the
650 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
651 character at the beginning of the line and extending to the
652 end of the line. Newlines in the input are represented by a
653 tilde <tt>~</tt> on a line of its own.
654 </p>
655 </dd>
657 none
658 </dt>
659 <dd>
660 <p>
661 Disable word diff again.
662 </p>
663 </dd>
664 </dl></div>
666 highlight the changed parts in all modes if enabled.</p></div>
667 </dd>
669 --word-diff-regex=<regex>
670 </dt>
671 <dd>
672 <p>
673 Use <regex> to decide what a word is, instead of considering
674 runs of non-whitespace to be a word. Also implies
675 <tt>--word-diff</tt> unless it was already enabled.
676 </p>
678 <regex> is considered a word. Anything between these matches is
679 considered whitespace and ignored(!) for the purposes of finding
680 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
681 expression to make sure that it matches all non-whitespace characters.
682 A match that contains a newline is silently truncated(!) at the
683 newline.</p></div>
684 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
685 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
686 overrides any diff driver or configuration setting. Diff drivers
687 override configuration settings.</p></div>
688 </dd>
690 --color-words[=<regex>]
691 </dt>
692 <dd>
693 <p>
694 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
695 specified) <tt>--word-diff-regex=<regex></tt>.
696 </p>
697 </dd>
699 --no-renames
700 </dt>
701 <dd>
702 <p>
703 Turn off rename detection, even when the configuration
704 file gives the default to do so.
705 </p>
706 </dd>
708 --check
709 </dt>
710 <dd>
711 <p>
712 Warn if changes introduce trailing whitespace
713 or an indent that uses a space before a tab. Exits with
714 non-zero status if problems are found. Not compatible with
715 --exit-code.
716 </p>
717 </dd>
719 --full-index
720 </dt>
721 <dd>
722 <p>
723 Instead of the first handful of characters, show the full
725 line when generating patch format output.
726 </p>
727 </dd>
729 --binary
730 </dt>
731 <dd>
732 <p>
733 In addition to <tt>--full-index</tt>, output a binary diff that
734 can be applied with <tt>git-apply</tt>.
735 </p>
736 </dd>
738 --abbrev[=<n>]
739 </dt>
740 <dd>
741 <p>
742 Instead of showing the full 40-byte hexadecimal object
743 name in diff-raw format output and diff-tree header
744 lines, show only a partial prefix. This is
745 independent of the <tt>--full-index</tt> option above, which controls
746 the diff-patch output format. Non default number of
747 digits can be specified with <tt>--abbrev=<n></tt>.
748 </p>
749 </dd>
751 -B[<n>][/<m>]
752 </dt>
754 --break-rewrites[=[<n>][/<m>]]
755 </dt>
756 <dd>
757 <p>
758 Break complete rewrite changes into pairs of delete and
759 create. This serves two purposes:
760 </p>
762 not as a series of deletion and insertion mixed together with a very
763 few lines that happen to match textually as the context, but as a
764 single deletion of everything old followed by a single insertion of
765 everything new, and the number <tt>m</tt> controls this aspect of the -B
766 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
767 original should remain in the result for git to consider it a total
768 rewrite (i.e. otherwise the resulting patch will be a series of
769 deletion and insertion mixed together with context lines).</p></div>
771 source of a rename (usually -M only considers a file that disappeared
772 as the source of a rename), and the number <tt>n</tt> controls this aspect of
773 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
774 addition and deletion compared to 20% or more of the file’s size are
775 eligible for being picked up as a possible source of a rename to
776 another file.</p></div>
777 </dd>
779 -M[<n>]
780 </dt>
782 --detect-renames[=<n>]
783 </dt>
784 <dd>
785 <p>
786 Detect renames.
787 If <tt>n</tt> is specified, it is a is a threshold on the similarity
788 index (i.e. amount of addition/deletions compared to the
789 file’s size). For example, <tt>-M90%</tt> means git should consider a
790 delete/add pair to be a rename if more than 90% of the file
791 hasn’t changed.
792 </p>
793 </dd>
795 -C[<n>]
796 </dt>
798 --detect-copies[=<n>]
799 </dt>
800 <dd>
801 <p>
802 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
803 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
804 </p>
805 </dd>
807 --find-copies-harder
808 </dt>
809 <dd>
810 <p>
811 For performance reasons, by default, <tt>-C</tt> option finds copies only
812 if the original file of the copy was modified in the same
813 changeset. This flag makes the command
814 inspect unmodified files as candidates for the source of
815 copy. This is a very expensive operation for large
816 projects, so use it with caution. Giving more than one
817 <tt>-C</tt> option has the same effect.
818 </p>
819 </dd>
821 -l<num>
822 </dt>
823 <dd>
824 <p>
825 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
826 is the number of potential rename/copy targets. This
827 option prevents rename/copy detection from running if
828 the number of rename/copy targets exceeds the specified
829 number.
830 </p>
831 </dd>
833 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
834 </dt>
835 <dd>
836 <p>
837 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
838 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
839 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
840 are Unmerged (<tt>U</tt>), are
841 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
842 Any combination of the filter characters (including none) can be used.
843 When <tt>*</tt> (All-or-none) is added to the combination, all
844 paths are selected if there is any file that matches
845 other criteria in the comparison; if there is no file
846 that matches other criteria, nothing is selected.
847 </p>
848 </dd>
850 -S<string>
851 </dt>
852 <dd>
853 <p>
854 Look for differences that introduce or remove an instance of
855 <string>. Note that this is different than the string simply
856 appearing in diff output; see the <em>pickaxe</em> entry in
858 </p>
859 </dd>
861 -G<regex>
862 </dt>
863 <dd>
864 <p>
865 Look for differences whose added or removed line matches
866 the given <regex>.
867 </p>
868 </dd>
870 --pickaxe-all
871 </dt>
872 <dd>
873 <p>
874 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
875 changeset, not just the files that contain the change
876 in <string>.
877 </p>
878 </dd>
880 --pickaxe-regex
881 </dt>
882 <dd>
883 <p>
884 Make the <string> not a plain string but an extended POSIX
885 regex to match.
886 </p>
887 </dd>
889 -O<orderfile>
890 </dt>
891 <dd>
892 <p>
893 Output the patch in the order specified in the
894 <orderfile>, which has one shell glob pattern per line.
895 </p>
896 </dd>
898 -R
899 </dt>
900 <dd>
901 <p>
902 Swap two inputs; that is, show differences from index or
903 on-disk file to tree contents.
904 </p>
905 </dd>
907 --relative[=<path>]
908 </dt>
909 <dd>
910 <p>
911 When run from a subdirectory of the project, it can be
912 told to exclude changes outside the directory and show
913 pathnames relative to it with this option. When you are
914 not in a subdirectory (e.g. in a bare repository), you
915 can name which subdirectory to make the output relative
916 to by giving a <path> as an argument.
917 </p>
918 </dd>
920 -a
921 </dt>
923 --text
924 </dt>
925 <dd>
926 <p>
927 Treat all files as text.
928 </p>
929 </dd>
931 --ignore-space-at-eol
932 </dt>
933 <dd>
934 <p>
935 Ignore changes in whitespace at EOL.
936 </p>
937 </dd>
939 -b
940 </dt>
942 --ignore-space-change
943 </dt>
944 <dd>
945 <p>
946 Ignore changes in amount of whitespace. This ignores whitespace
947 at line end, and considers all other sequences of one or
948 more whitespace characters to be equivalent.
949 </p>
950 </dd>
952 -w
953 </dt>
955 --ignore-all-space
956 </dt>
957 <dd>
958 <p>
959 Ignore whitespace when comparing lines. This ignores
960 differences even if one line has whitespace where the other
961 line has none.
962 </p>
963 </dd>
965 --inter-hunk-context=<lines>
966 </dt>
967 <dd>
968 <p>
969 Show the context between diff hunks, up to the specified number
970 of lines, thereby fusing hunks that are close to each other.
971 </p>
972 </dd>
974 --exit-code
975 </dt>
976 <dd>
977 <p>
978 Make the program exit with codes similar to diff(1).
979 That is, it exits with 1 if there were differences and
980 0 means no differences.
981 </p>
982 </dd>
984 --quiet
985 </dt>
986 <dd>
987 <p>
988 Disable all output of the program. Implies <tt>--exit-code</tt>.
989 </p>
990 </dd>
992 --ext-diff
993 </dt>
994 <dd>
995 <p>
996 Allow an external diff helper to be executed. If you set an
999 </p>
1000 </dd>
1002 --no-ext-diff
1003 </dt>
1004 <dd>
1005 <p>
1006 Disallow external diff drivers.
1007 </p>
1008 </dd>
1010 --ignore-submodules[=<when>]
1011 </dt>
1012 <dd>
1013 <p>
1014 Ignore changes to submodules in the diff generation. <when> can be
1017 untracked or modified files or its HEAD differs from the commit recorded
1018 in the superproject and can be used to override any settings of the
1019 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1021 contain untracked content (but they are still scanned for modified
1023 only changes to the commits stored in the superproject are shown (this was
1025 </p>
1026 </dd>
1028 --src-prefix=<prefix>
1029 </dt>
1030 <dd>
1031 <p>
1033 </p>
1034 </dd>
1036 --dst-prefix=<prefix>
1037 </dt>
1038 <dd>
1039 <p>
1041 </p>
1042 </dd>
1044 --no-prefix
1045 </dt>
1046 <dd>
1047 <p>
1048 Do not show any source or destination prefix.
1049 </p>
1050 </dd>
1051 </dl></div>
1056 <tree-ish>
1057 </dt>
1058 <dd>
1059 <p>
1060 The id of a tree object to diff against.
1061 </p>
1062 </dd>
1064 --cached
1065 </dt>
1066 <dd>
1067 <p>
1068 do not consider the on-disk file at all
1069 </p>
1070 </dd>
1072 -m
1073 </dt>
1074 <dd>
1075 <p>
1076 By default, files recorded in the index but not checked
1077 out are reported as deleted. This flag makes
1078 <em>git diff-index</em> say that all non-checked-out files are up
1079 to date.
1080 </p>
1081 </dd>
1082 </dl></div>
1083 </div>
1089 compared differs:</p></div>
1092 git-diff-index <tree-ish>
1093 </dt>
1094 <dd>
1095 <p>
1096 compares the <tree-ish> and the files on the filesystem.
1097 </p>
1098 </dd>
1100 git-diff-index --cached <tree-ish>
1101 </dt>
1102 <dd>
1103 <p>
1104 compares the <tree-ish> and the index.
1105 </p>
1106 </dd>
1108 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1109 </dt>
1110 <dd>
1111 <p>
1112 compares the trees named by the two arguments.
1113 </p>
1114 </dd>
1116 git-diff-files [<pattern>…]
1117 </dt>
1118 <dd>
1119 <p>
1120 compares the index and the files on the filesystem.
1121 </p>
1122 </dd>
1123 </dl></div>
1124 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1125 what is being compared. After that, all the commands print one output
1126 line per changed file.</p></div>
1130 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1131 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1132 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1133 create :000000 100644 0000000... 1234567... A file4
1134 delete :100644 000000 1234567... 0000000... D file5
1135 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1136 </div></div>
1139 <li>
1140 <p>
1141 a colon.
1142 </p>
1143 </li>
1144 <li>
1145 <p>
1147 </p>
1148 </li>
1149 <li>
1150 <p>
1151 a space.
1152 </p>
1153 </li>
1154 <li>
1155 <p>
1157 </p>
1158 </li>
1159 <li>
1160 <p>
1161 a space.
1162 </p>
1163 </li>
1164 <li>
1165 <p>
1167 </p>
1168 </li>
1169 <li>
1170 <p>
1171 a space.
1172 </p>
1173 </li>
1174 <li>
1175 <p>
1177 </p>
1178 </li>
1179 <li>
1180 <p>
1181 a space.
1182 </p>
1183 </li>
1184 <li>
1185 <p>
1187 </p>
1188 </li>
1189 <li>
1190 <p>
1191 a tab or a NUL when <em>-z</em> option is used.
1192 </p>
1193 </li>
1194 <li>
1195 <p>
1197 </p>
1198 </li>
1199 <li>
1200 <p>
1201 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1202 </p>
1203 </li>
1204 <li>
1205 <p>
1207 </p>
1208 </li>
1209 <li>
1210 <p>
1211 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1212 </p>
1213 </li>
1214 </ol></div>
1217 <li>
1218 <p>
1219 A: addition of a file
1220 </p>
1221 </li>
1222 <li>
1223 <p>
1224 C: copy of a file into a new one
1225 </p>
1226 </li>
1227 <li>
1228 <p>
1229 D: deletion of a file
1230 </p>
1231 </li>
1232 <li>
1233 <p>
1234 M: modification of the contents or mode of a file
1235 </p>
1236 </li>
1237 <li>
1238 <p>
1239 R: renaming of a file
1240 </p>
1241 </li>
1242 <li>
1243 <p>
1244 T: change in the type of the file
1245 </p>
1246 </li>
1247 <li>
1248 <p>
1249 U: file is unmerged (you must complete the merge before it can
1250 be committed)
1251 </p>
1252 </li>
1253 <li>
1254 <p>
1256 </p>
1257 </li>
1258 </ul></div>
1260 percentage of similarity between the source and target of the move or
1261 copy), and are the only ones to be so.</p></div>
1262 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1263 and it is out of sync with the index.</p></div>
1267 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1268 </div></div>
1269 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1270 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1271 respectively.</p></div>
1272 </div>
1276 can take <em>-c</em> or <em>--cc</em> option
1277 to generate diff output also for merge commits. The output differs
1278 from the format described above in the following way:</p></div>
1280 <li>
1281 <p>
1282 there is a colon for each parent
1283 </p>
1284 </li>
1285 <li>
1286 <p>
1288 </p>
1289 </li>
1290 <li>
1291 <p>
1292 status is concatenated status characters for each parent
1293 </p>
1294 </li>
1295 <li>
1296 <p>
1298 </p>
1299 </li>
1300 <li>
1301 <p>
1303 </p>
1304 </li>
1305 </ol></div>
1309 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1310 </div></div>
1311 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1312 all parents.</p></div>
1313 </div>
1319 do not produce the output described above; instead they produce a
1320 patch file. You can customize the creation of such patches via the
1321 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1322 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1323 diff format:</p></div>
1325 <li>
1326 <p>
1328 </p>
1331 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1332 </div></div>
1333 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1334 involved. Especially, even for a creation or a deletion,
1335 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1336 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1337 name of the source file of the rename/copy and the name of
1338 the file that rename/copy produces, respectively.</p></div>
1339 </li>
1340 <li>
1341 <p>
1342 It is followed by one or more extended header lines:
1343 </p>
1346 <pre><tt>old mode <mode>
1347 new mode <mode>
1348 deleted file mode <mode>
1349 new file mode <mode>
1350 copy from <path>
1351 copy to <path>
1352 rename from <path>
1353 rename to <path>
1354 similarity index <number>
1355 dissimilarity index <number>
1356 index <hash>..<hash> <mode></tt></pre>
1357 </div></div>
1358 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1359 and file permission bits.</p></div>
1360 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1362 the dissimilarity index is the percentage of changed lines. It
1363 is a rounded down integer, followed by a percent sign. The
1364 similarity index value of 100% is thus reserved for two equal
1365 files, while 100% dissimilarity means that no line from the old
1366 file made it into the new one.</p></div>
1367 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1368 The <mode> is included if the file mode does not change; otherwise,
1369 separate lines indicate the old and the new mode.</p></div>
1370 </li>
1371 <li>
1372 <p>
1373 TAB, LF, double quote and backslash characters in pathnames
1375 If there is need for such substitution then the whole
1376 pathname is put in double quotes.
1377 </p>
1378 </li>
1379 <li>
1380 <p>
1383 It is incorrect to apply each change to each file sequentially. For
1384 example, this patch will swap a and b:
1385 </p>
1388 <pre><tt>diff --git a/a b/b
1389 rename from a
1390 rename to b
1391 diff --git a/b b/a
1392 rename from b
1393 rename to a</tt></pre>
1394 </div></div>
1395 </li>
1396 </ol></div>
1397 </div>
1400 <div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
1402 with "git log -p", this is the default format; you can force showing
1407 <pre><tt>diff --combined describe.c
1408 index fabadb8,cc95eb0..4866510
1409 --- a/describe.c
1410 +++ b/describe.c
1413 }
1415 - static void describe(char *arg)
1416 -static void describe(struct commit *cmit, int last_one)
1417 ++static void describe(char *arg, int last_one)
1418 {
1419 + unsigned char sha1[20];
1420 + struct commit *cmit;
1421 struct commit_list *list;
1422 static int initialized = 0;
1423 struct commit_name *n;
1426 + usage(describe_usage);
1427 + cmit = lookup_commit_reference(sha1);
1428 + if (!cmit)
1429 + usage(describe_usage);
1430 +
1431 if (!initialized) {
1432 initialized = 1;
1433 for_each_ref(get_name);</tt></pre>
1434 </div></div>
1436 <li>
1437 <p>
1438 It is preceded with a "git diff" header, that looks like
1440 </p>
1444 </div></div>
1449 </div></div>
1450 </li>
1451 <li>
1452 <p>
1453 It is followed by one or more extended header lines
1454 (this example shows a merge with two parents):
1455 </p>
1462 </div></div>
1463 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1465 information about detected contents movement (renames and
1466 copying detection) are designed to work with diff of two
1468 </li>
1469 <li>
1470 <p>
1471 It is followed by two-line from-file/to-file header
1472 </p>
1475 <pre><tt>--- a/file
1476 +++ b/file</tt></pre>
1477 </div></div>
1480 files.</p></div>
1481 </li>
1482 <li>
1483 <p>
1484 Chunk header format is modified to prevent people from
1486 was created for review of merge commit changes, and was not
1487 meant for apply. The change is similar to the change in the
1489 </p>
1492 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1493 </div></div>
1495 header for combined diff format.</p></div>
1496 </li>
1497 </ol></div>
1499 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
1501 compares two or more files file1, file2,… with one file X, and
1502 shows how X differs from each of fileN. One column for each of
1503 fileN is prepended to the output line to note how X’s line is
1504 different from it.</p></div>
1505 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1507 in the column N means that the line appears in the result,
1508 and fileN does not have that line (in other words, the line was
1509 added, from the point of view of that parent).</p></div>
1513 in either file1 nor file2). Also eight other lines are the same
1515 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1516 merge commit with the merge result (i.e. file1..fileN are the
1518 two unresolved merge parents with the working tree file
1521 </div>
1524 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1526 output. These options can be combined with other options, such as
1528 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1529 formats the pathnames compactly by combining common prefix and suffix of
1535 </div></div>
1536 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1538 like this:</p></div>
1543 </div></div>
1546 <li>
1547 <p>
1548 the number of added lines;
1549 </p>
1550 </li>
1551 <li>
1552 <p>
1553 a tab;
1554 </p>
1555 </li>
1556 <li>
1557 <p>
1558 the number of deleted lines;
1559 </p>
1560 </li>
1561 <li>
1562 <p>
1563 a tab;
1564 </p>
1565 </li>
1566 <li>
1567 <p>
1568 pathname (possibly with rename/copy information);
1569 </p>
1570 </li>
1571 <li>
1572 <p>
1573 a newline.
1574 </p>
1575 </li>
1576 </ol></div>
1577 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1582 </div></div>
1585 <li>
1586 <p>
1587 the number of added lines;
1588 </p>
1589 </li>
1590 <li>
1591 <p>
1592 a tab;
1593 </p>
1594 </li>
1595 <li>
1596 <p>
1597 the number of deleted lines;
1598 </p>
1599 </li>
1600 <li>
1601 <p>
1602 a tab;
1603 </p>
1604 </li>
1605 <li>
1606 <p>
1607 a NUL (only exists if renamed/copied);
1608 </p>
1609 </li>
1610 <li>
1611 <p>
1612 pathname in preimage;
1613 </p>
1614 </li>
1615 <li>
1616 <p>
1617 a NUL (only exists if renamed/copied);
1618 </p>
1619 </li>
1620 <li>
1621 <p>
1622 pathname in postimage (only exists if renamed/copied);
1623 </p>
1624 </li>
1625 <li>
1626 <p>
1627 a NUL.
1628 </p>
1629 </li>
1630 </ol></div>
1631 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1632 scripts that read the output to tell if the current record being read is
1633 a single-path record or a rename/copy record without reading ahead.
1636 </div>
1642 of these operations are very useful indeed.</p></div>
1643 </div>
1649 <pre><tt>show me the differences between HEAD and the current index
1650 contents (the ones I'd write using 'git write-tree')</tt></pre>
1651 </div></div>
1652 <div class="paragraph"><p>For example, let’s say that you have worked on your working directory, updated
1653 some files in the index and are ready to commit. You want to see exactly
1655 object and compare it that way, and to do that, you just do</p></div>
1659 </div></div>
1660 <div class="paragraph"><p>Example: let’s say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had
1669 </div></div>
1671 <div class="paragraph"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to
1673 nicer for the case where you just want to check where you are.</p></div>
1674 <div class="paragraph"><p>So doing a <tt>git diff-index --cached</tt> is basically very useful when you are
1675 asking yourself "what have I already marked for being committed, and
1677 </div>
1681 the more useful of the two in that what it does can’t be emulated with
1683 The non-cached version asks the question:</p></div>
1686 <pre><tt>show me the differences between HEAD and the currently checked out
1687 tree - index contents _and_ files that aren't up-to-date</tt></pre>
1688 </div></div>
1689 <div class="paragraph"><p>which is obviously a very useful question too, since that tells you what
1691 output to a tee, but with a twist.</p></div>
1692 <div class="paragraph"><p>The twist is that if some file doesn’t match the index, we don’t have
1693 a backing store thing for it, and we use the magic "all-zero" sha1 to
1701 </div></div>
1702 <div class="paragraph"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is
1703 not up-to-date and may contain new stuff. The all-zero sha1 means that to
1704 get the real diff, you need to look at the object in the working directory
1705 directly rather than do an object-to-object diff.</p></div>
1707 <table><tr>
1710 </td>
1712 actually look at the contents of the file at all. So maybe
1714 touched it. In either case, it’s a note that you need to
1716 </tr></table>
1717 </div>
1719 <table><tr>
1722 </td>
1724 and "is still dirty in the working directory" together. You can always
1725 tell which file is in which state, since the "has been updated" ones
1726 show a valid sha1, and the "not in sync with the index" ones will
1727 always have the special all-zero sha1.</td>
1728 </tr></table>
1729 </div>
1730 </div>
1733 <div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
1734 </div>
1737 <div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
1738 </div>
1742 </div>
1746 </div>
1747 </div>
1748 </body>
1749 </html>