| blob | 0dd554cb5261ed410500e6dc609464f5b21a312a |
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 <div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring
528 the amount of pure code movements within a file. In other words,
529 rearranging lines in a file is not counted as much as other changes.</p></div>
530 </dd>
533 </dt>
534 <dd>
535 <p>
537 </p>
538 </dd>
540 --summary
541 </dt>
542 <dd>
543 <p>
544 Output a condensed summary of extended header information
545 such as creations, renames and mode changes.
546 </p>
547 </dd>
549 --patch-with-stat
550 </dt>
551 <dd>
552 <p>
554 </p>
555 </dd>
557 -z
558 </dt>
559 <dd>
560 <p>
561 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
562 given, do not munge pathnames and use NULs as output field terminators.
563 </p>
564 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
566 respectively, and the pathname will be enclosed in double quotes if
567 any of those replacements occurred.</p></div>
568 </dd>
570 --name-only
571 </dt>
572 <dd>
573 <p>
574 Show only names of changed files.
575 </p>
576 </dd>
578 --name-status
579 </dt>
580 <dd>
581 <p>
582 Show only names and status of changed files. See the description
583 of the <tt>--diff-filter</tt> option on what the status letters mean.
584 </p>
585 </dd>
587 --submodule[=<format>]
588 </dt>
589 <dd>
590 <p>
591 Chose the output format for submodule differences. <format> can be one of
592 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
593 is used when this option is not given. <em>log</em> is the default value for this
594 option and lists the commits in that commit range like the <em>summary</em>
596 </p>
597 </dd>
599 --color[=<when>]
600 </dt>
601 <dd>
602 <p>
603 Show colored diff.
604 The value must be always (the default), never, or auto.
605 </p>
606 </dd>
608 --no-color
609 </dt>
610 <dd>
611 <p>
612 Turn off colored diff, even when the configuration file
613 gives the default to color output.
614 Same as <tt>--color=never</tt>.
615 </p>
616 </dd>
618 --word-diff[=<mode>]
619 </dt>
620 <dd>
621 <p>
622 Show a word diff, using the <mode> to delimit changed words.
623 By default, words are delimited by whitespace; see
624 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
625 must be one of:
626 </p>
629 color
630 </dt>
631 <dd>
632 <p>
633 Highlight changed words using only colors. Implies <tt>--color</tt>.
634 </p>
635 </dd>
637 plain
638 </dt>
639 <dd>
640 <p>
641 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
642 attempts to escape the delimiters if they appear in the input,
643 so the output may be ambiguous.
644 </p>
645 </dd>
647 porcelain
648 </dt>
649 <dd>
650 <p>
651 Use a special line-based format intended for script
652 consumption. Added/removed/unchanged runs are printed in the
653 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
654 character at the beginning of the line and extending to the
655 end of the line. Newlines in the input are represented by a
656 tilde <tt>~</tt> on a line of its own.
657 </p>
658 </dd>
660 none
661 </dt>
662 <dd>
663 <p>
664 Disable word diff again.
665 </p>
666 </dd>
667 </dl></div>
669 highlight the changed parts in all modes if enabled.</p></div>
670 </dd>
672 --word-diff-regex=<regex>
673 </dt>
674 <dd>
675 <p>
676 Use <regex> to decide what a word is, instead of considering
677 runs of non-whitespace to be a word. Also implies
678 <tt>--word-diff</tt> unless it was already enabled.
679 </p>
681 <regex> is considered a word. Anything between these matches is
682 considered whitespace and ignored(!) for the purposes of finding
683 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
684 expression to make sure that it matches all non-whitespace characters.
685 A match that contains a newline is silently truncated(!) at the
686 newline.</p></div>
687 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
688 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
689 overrides any diff driver or configuration setting. Diff drivers
690 override configuration settings.</p></div>
691 </dd>
693 --color-words[=<regex>]
694 </dt>
695 <dd>
696 <p>
697 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
698 specified) <tt>--word-diff-regex=<regex></tt>.
699 </p>
700 </dd>
702 --no-renames
703 </dt>
704 <dd>
705 <p>
706 Turn off rename detection, even when the configuration
707 file gives the default to do so.
708 </p>
709 </dd>
711 --check
712 </dt>
713 <dd>
714 <p>
715 Warn if changes introduce trailing whitespace
716 or an indent that uses a space before a tab. Exits with
717 non-zero status if problems are found. Not compatible with
718 --exit-code.
719 </p>
720 </dd>
722 --full-index
723 </dt>
724 <dd>
725 <p>
726 Instead of the first handful of characters, show the full
728 line when generating patch format output.
729 </p>
730 </dd>
732 --binary
733 </dt>
734 <dd>
735 <p>
736 In addition to <tt>--full-index</tt>, output a binary diff that
737 can be applied with <tt>git-apply</tt>.
738 </p>
739 </dd>
741 --abbrev[=<n>]
742 </dt>
743 <dd>
744 <p>
745 Instead of showing the full 40-byte hexadecimal object
746 name in diff-raw format output and diff-tree header
747 lines, show only a partial prefix. This is
748 independent of the <tt>--full-index</tt> option above, which controls
749 the diff-patch output format. Non default number of
750 digits can be specified with <tt>--abbrev=<n></tt>.
751 </p>
752 </dd>
754 -B[<n>][/<m>]
755 </dt>
757 --break-rewrites[=[<n>][/<m>]]
758 </dt>
759 <dd>
760 <p>
761 Break complete rewrite changes into pairs of delete and
762 create. This serves two purposes:
763 </p>
765 not as a series of deletion and insertion mixed together with a very
766 few lines that happen to match textually as the context, but as a
767 single deletion of everything old followed by a single insertion of
768 everything new, and the number <tt>m</tt> controls this aspect of the -B
769 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
770 original should remain in the result for git to consider it a total
771 rewrite (i.e. otherwise the resulting patch will be a series of
772 deletion and insertion mixed together with context lines).</p></div>
774 source of a rename (usually -M only considers a file that disappeared
775 as the source of a rename), and the number <tt>n</tt> controls this aspect of
776 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
777 addition and deletion compared to 20% or more of the file’s size are
778 eligible for being picked up as a possible source of a rename to
779 another file.</p></div>
780 </dd>
782 -M[<n>]
783 </dt>
785 --find-renames[=<n>]
786 </dt>
787 <dd>
788 <p>
789 Detect renames.
790 If <tt>n</tt> is specified, it is a is a threshold on the similarity
791 index (i.e. amount of addition/deletions compared to the
792 file’s size). For example, <tt>-M90%</tt> means git should consider a
793 delete/add pair to be a rename if more than 90% of the file
794 hasn’t changed.
795 </p>
796 </dd>
798 -C[<n>]
799 </dt>
801 --find-copies[=<n>]
802 </dt>
803 <dd>
804 <p>
805 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
806 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
807 </p>
808 </dd>
810 --find-copies-harder
811 </dt>
812 <dd>
813 <p>
814 For performance reasons, by default, <tt>-C</tt> option finds copies only
815 if the original file of the copy was modified in the same
816 changeset. This flag makes the command
817 inspect unmodified files as candidates for the source of
818 copy. This is a very expensive operation for large
819 projects, so use it with caution. Giving more than one
820 <tt>-C</tt> option has the same effect.
821 </p>
822 </dd>
824 -D
825 </dt>
827 --irreversible-delete
828 </dt>
829 <dd>
830 <p>
831 Omit the preimage for deletes, i.e. print only the header but not
832 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
833 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
834 solely for people who want to just concentrate on reviewing the
835 text after the change. In addition, the output obviously lack
836 enough information to apply such a patch in reverse, even manually,
837 hence the name of the option.
838 </p>
839 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
840 of a delete/create pair.</p></div>
841 </dd>
843 -l<num>
844 </dt>
845 <dd>
846 <p>
847 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
848 is the number of potential rename/copy targets. This
849 option prevents rename/copy detection from running if
850 the number of rename/copy targets exceeds the specified
851 number.
852 </p>
853 </dd>
855 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
856 </dt>
857 <dd>
858 <p>
859 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
860 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
861 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
862 are Unmerged (<tt>U</tt>), are
863 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
864 Any combination of the filter characters (including none) can be used.
865 When <tt>*</tt> (All-or-none) is added to the combination, all
866 paths are selected if there is any file that matches
867 other criteria in the comparison; if there is no file
868 that matches other criteria, nothing is selected.
869 </p>
870 </dd>
872 -S<string>
873 </dt>
874 <dd>
875 <p>
876 Look for differences that introduce or remove an instance of
877 <string>. Note that this is different than the string simply
878 appearing in diff output; see the <em>pickaxe</em> entry in
880 </p>
881 </dd>
883 -G<regex>
884 </dt>
885 <dd>
886 <p>
887 Look for differences whose added or removed line matches
888 the given <regex>.
889 </p>
890 </dd>
892 --pickaxe-all
893 </dt>
894 <dd>
895 <p>
896 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
897 changeset, not just the files that contain the change
898 in <string>.
899 </p>
900 </dd>
902 --pickaxe-regex
903 </dt>
904 <dd>
905 <p>
906 Make the <string> not a plain string but an extended POSIX
907 regex to match.
908 </p>
909 </dd>
911 -O<orderfile>
912 </dt>
913 <dd>
914 <p>
915 Output the patch in the order specified in the
916 <orderfile>, which has one shell glob pattern per line.
917 </p>
918 </dd>
920 -R
921 </dt>
922 <dd>
923 <p>
924 Swap two inputs; that is, show differences from index or
925 on-disk file to tree contents.
926 </p>
927 </dd>
929 --relative[=<path>]
930 </dt>
931 <dd>
932 <p>
933 When run from a subdirectory of the project, it can be
934 told to exclude changes outside the directory and show
935 pathnames relative to it with this option. When you are
936 not in a subdirectory (e.g. in a bare repository), you
937 can name which subdirectory to make the output relative
938 to by giving a <path> as an argument.
939 </p>
940 </dd>
942 -a
943 </dt>
945 --text
946 </dt>
947 <dd>
948 <p>
949 Treat all files as text.
950 </p>
951 </dd>
953 --ignore-space-at-eol
954 </dt>
955 <dd>
956 <p>
957 Ignore changes in whitespace at EOL.
958 </p>
959 </dd>
961 -b
962 </dt>
964 --ignore-space-change
965 </dt>
966 <dd>
967 <p>
968 Ignore changes in amount of whitespace. This ignores whitespace
969 at line end, and considers all other sequences of one or
970 more whitespace characters to be equivalent.
971 </p>
972 </dd>
974 -w
975 </dt>
977 --ignore-all-space
978 </dt>
979 <dd>
980 <p>
981 Ignore whitespace when comparing lines. This ignores
982 differences even if one line has whitespace where the other
983 line has none.
984 </p>
985 </dd>
987 --inter-hunk-context=<lines>
988 </dt>
989 <dd>
990 <p>
991 Show the context between diff hunks, up to the specified number
992 of lines, thereby fusing hunks that are close to each other.
993 </p>
994 </dd>
996 --exit-code
997 </dt>
998 <dd>
999 <p>
1000 Make the program exit with codes similar to diff(1).
1001 That is, it exits with 1 if there were differences and
1002 0 means no differences.
1003 </p>
1004 </dd>
1006 --quiet
1007 </dt>
1008 <dd>
1009 <p>
1010 Disable all output of the program. Implies <tt>--exit-code</tt>.
1011 </p>
1012 </dd>
1014 --ext-diff
1015 </dt>
1016 <dd>
1017 <p>
1018 Allow an external diff helper to be executed. If you set an
1021 </p>
1022 </dd>
1024 --no-ext-diff
1025 </dt>
1026 <dd>
1027 <p>
1028 Disallow external diff drivers.
1029 </p>
1030 </dd>
1032 --ignore-submodules[=<when>]
1033 </dt>
1034 <dd>
1035 <p>
1036 Ignore changes to submodules in the diff generation. <when> can be
1039 untracked or modified files or its HEAD differs from the commit recorded
1040 in the superproject and can be used to override any settings of the
1041 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1043 contain untracked content (but they are still scanned for modified
1045 only changes to the commits stored in the superproject are shown (this was
1047 </p>
1048 </dd>
1050 --src-prefix=<prefix>
1051 </dt>
1052 <dd>
1053 <p>
1055 </p>
1056 </dd>
1058 --dst-prefix=<prefix>
1059 </dt>
1060 <dd>
1061 <p>
1063 </p>
1064 </dd>
1066 --no-prefix
1067 </dt>
1068 <dd>
1069 <p>
1070 Do not show any source or destination prefix.
1071 </p>
1072 </dd>
1073 </dl></div>
1078 <tree-ish>
1079 </dt>
1080 <dd>
1081 <p>
1082 The id of a tree object to diff against.
1083 </p>
1084 </dd>
1086 --cached
1087 </dt>
1088 <dd>
1089 <p>
1090 do not consider the on-disk file at all
1091 </p>
1092 </dd>
1094 -m
1095 </dt>
1096 <dd>
1097 <p>
1098 By default, files recorded in the index but not checked
1099 out are reported as deleted. This flag makes
1100 <em>git diff-index</em> say that all non-checked-out files are up
1101 to date.
1102 </p>
1103 </dd>
1104 </dl></div>
1105 </div>
1111 compared differs:</p></div>
1114 git-diff-index <tree-ish>
1115 </dt>
1116 <dd>
1117 <p>
1118 compares the <tree-ish> and the files on the filesystem.
1119 </p>
1120 </dd>
1122 git-diff-index --cached <tree-ish>
1123 </dt>
1124 <dd>
1125 <p>
1126 compares the <tree-ish> and the index.
1127 </p>
1128 </dd>
1130 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1131 </dt>
1132 <dd>
1133 <p>
1134 compares the trees named by the two arguments.
1135 </p>
1136 </dd>
1138 git-diff-files [<pattern>…]
1139 </dt>
1140 <dd>
1141 <p>
1142 compares the index and the files on the filesystem.
1143 </p>
1144 </dd>
1145 </dl></div>
1146 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1147 what is being compared. After that, all the commands print one output
1148 line per changed file.</p></div>
1152 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1153 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1154 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1155 create :000000 100644 0000000... 1234567... A file4
1156 delete :100644 000000 1234567... 0000000... D file5
1157 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1158 </div></div>
1161 <li>
1162 <p>
1163 a colon.
1164 </p>
1165 </li>
1166 <li>
1167 <p>
1169 </p>
1170 </li>
1171 <li>
1172 <p>
1173 a space.
1174 </p>
1175 </li>
1176 <li>
1177 <p>
1179 </p>
1180 </li>
1181 <li>
1182 <p>
1183 a space.
1184 </p>
1185 </li>
1186 <li>
1187 <p>
1189 </p>
1190 </li>
1191 <li>
1192 <p>
1193 a space.
1194 </p>
1195 </li>
1196 <li>
1197 <p>
1199 </p>
1200 </li>
1201 <li>
1202 <p>
1203 a space.
1204 </p>
1205 </li>
1206 <li>
1207 <p>
1209 </p>
1210 </li>
1211 <li>
1212 <p>
1213 a tab or a NUL when <em>-z</em> option is used.
1214 </p>
1215 </li>
1216 <li>
1217 <p>
1219 </p>
1220 </li>
1221 <li>
1222 <p>
1223 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1224 </p>
1225 </li>
1226 <li>
1227 <p>
1229 </p>
1230 </li>
1231 <li>
1232 <p>
1233 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1234 </p>
1235 </li>
1236 </ol></div>
1239 <li>
1240 <p>
1241 A: addition of a file
1242 </p>
1243 </li>
1244 <li>
1245 <p>
1246 C: copy of a file into a new one
1247 </p>
1248 </li>
1249 <li>
1250 <p>
1251 D: deletion of a file
1252 </p>
1253 </li>
1254 <li>
1255 <p>
1256 M: modification of the contents or mode of a file
1257 </p>
1258 </li>
1259 <li>
1260 <p>
1261 R: renaming of a file
1262 </p>
1263 </li>
1264 <li>
1265 <p>
1266 T: change in the type of the file
1267 </p>
1268 </li>
1269 <li>
1270 <p>
1271 U: file is unmerged (you must complete the merge before it can
1272 be committed)
1273 </p>
1274 </li>
1275 <li>
1276 <p>
1278 </p>
1279 </li>
1280 </ul></div>
1282 percentage of similarity between the source and target of the move or
1283 copy), and are the only ones to be so.</p></div>
1284 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1285 and it is out of sync with the index.</p></div>
1289 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1290 </div></div>
1291 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1292 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1293 respectively.</p></div>
1294 </div>
1298 can take <em>-c</em> or <em>--cc</em> option
1299 to generate diff output also for merge commits. The output differs
1300 from the format described above in the following way:</p></div>
1302 <li>
1303 <p>
1304 there is a colon for each parent
1305 </p>
1306 </li>
1307 <li>
1308 <p>
1310 </p>
1311 </li>
1312 <li>
1313 <p>
1314 status is concatenated status characters for each parent
1315 </p>
1316 </li>
1317 <li>
1318 <p>
1320 </p>
1321 </li>
1322 <li>
1323 <p>
1325 </p>
1326 </li>
1327 </ol></div>
1331 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1332 </div></div>
1333 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1334 all parents.</p></div>
1335 </div>
1341 do not produce the output described above; instead they produce a
1342 patch file. You can customize the creation of such patches via the
1343 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1344 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1345 diff format:</p></div>
1347 <li>
1348 <p>
1350 </p>
1353 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1354 </div></div>
1355 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1356 involved. Especially, even for a creation or a deletion,
1357 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1358 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1359 name of the source file of the rename/copy and the name of
1360 the file that rename/copy produces, respectively.</p></div>
1361 </li>
1362 <li>
1363 <p>
1364 It is followed by one or more extended header lines:
1365 </p>
1368 <pre><tt>old mode <mode>
1369 new mode <mode>
1370 deleted file mode <mode>
1371 new file mode <mode>
1372 copy from <path>
1373 copy to <path>
1374 rename from <path>
1375 rename to <path>
1376 similarity index <number>
1377 dissimilarity index <number>
1378 index <hash>..<hash> <mode></tt></pre>
1379 </div></div>
1380 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1381 and file permission bits.</p></div>
1382 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1384 the dissimilarity index is the percentage of changed lines. It
1385 is a rounded down integer, followed by a percent sign. The
1386 similarity index value of 100% is thus reserved for two equal
1387 files, while 100% dissimilarity means that no line from the old
1388 file made it into the new one.</p></div>
1389 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1390 The <mode> is included if the file mode does not change; otherwise,
1391 separate lines indicate the old and the new mode.</p></div>
1392 </li>
1393 <li>
1394 <p>
1395 TAB, LF, double quote and backslash characters in pathnames
1397 If there is need for such substitution then the whole
1398 pathname is put in double quotes.
1399 </p>
1400 </li>
1401 <li>
1402 <p>
1405 It is incorrect to apply each change to each file sequentially. For
1406 example, this patch will swap a and b:
1407 </p>
1410 <pre><tt>diff --git a/a b/b
1411 rename from a
1412 rename to b
1413 diff --git a/b b/a
1414 rename from b
1415 rename to a</tt></pre>
1416 </div></div>
1417 </li>
1418 </ol></div>
1419 </div>
1422 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1425 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1426 of these commands to force generation of diffs with individual parents
1427 of a merge.</p></div>
1431 <pre><tt>diff --combined describe.c
1432 index fabadb8,cc95eb0..4866510
1433 --- a/describe.c
1434 +++ b/describe.c
1437 }
1439 - static void describe(char *arg)
1440 -static void describe(struct commit *cmit, int last_one)
1441 ++static void describe(char *arg, int last_one)
1442 {
1443 + unsigned char sha1[20];
1444 + struct commit *cmit;
1445 struct commit_list *list;
1446 static int initialized = 0;
1447 struct commit_name *n;
1450 + usage(describe_usage);
1451 + cmit = lookup_commit_reference(sha1);
1452 + if (!cmit)
1453 + usage(describe_usage);
1454 +
1455 if (!initialized) {
1456 initialized = 1;
1457 for_each_ref(get_name);</tt></pre>
1458 </div></div>
1460 <li>
1461 <p>
1462 It is preceded with a "git diff" header, that looks like
1464 </p>
1468 </div></div>
1473 </div></div>
1474 </li>
1475 <li>
1476 <p>
1477 It is followed by one or more extended header lines
1478 (this example shows a merge with two parents):
1479 </p>
1486 </div></div>
1487 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1489 information about detected contents movement (renames and
1490 copying detection) are designed to work with diff of two
1492 </li>
1493 <li>
1494 <p>
1495 It is followed by two-line from-file/to-file header
1496 </p>
1499 <pre><tt>--- a/file
1500 +++ b/file</tt></pre>
1501 </div></div>
1504 files.</p></div>
1505 </li>
1506 <li>
1507 <p>
1508 Chunk header format is modified to prevent people from
1510 was created for review of merge commit changes, and was not
1511 meant for apply. The change is similar to the change in the
1513 </p>
1516 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1517 </div></div>
1519 header for combined diff format.</p></div>
1520 </li>
1521 </ol></div>
1523 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
1525 compares two or more files file1, file2,… with one file X, and
1526 shows how X differs from each of fileN. One column for each of
1527 fileN is prepended to the output line to note how X’s line is
1528 different from it.</p></div>
1529 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1531 in the column N means that the line appears in the result,
1532 and fileN does not have that line (in other words, the line was
1533 added, from the point of view of that parent).</p></div>
1537 in either file1 nor file2). Also eight other lines are the same
1539 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1540 merge commit with the merge result (i.e. file1..fileN are the
1542 two unresolved merge parents with the working tree file
1545 </div>
1548 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1550 output. These options can be combined with other options, such as
1552 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1553 formats the pathnames compactly by combining common prefix and suffix of
1559 </div></div>
1560 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1562 like this:</p></div>
1567 </div></div>
1570 <li>
1571 <p>
1572 the number of added lines;
1573 </p>
1574 </li>
1575 <li>
1576 <p>
1577 a tab;
1578 </p>
1579 </li>
1580 <li>
1581 <p>
1582 the number of deleted lines;
1583 </p>
1584 </li>
1585 <li>
1586 <p>
1587 a tab;
1588 </p>
1589 </li>
1590 <li>
1591 <p>
1592 pathname (possibly with rename/copy information);
1593 </p>
1594 </li>
1595 <li>
1596 <p>
1597 a newline.
1598 </p>
1599 </li>
1600 </ol></div>
1601 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1606 </div></div>
1609 <li>
1610 <p>
1611 the number of added lines;
1612 </p>
1613 </li>
1614 <li>
1615 <p>
1616 a tab;
1617 </p>
1618 </li>
1619 <li>
1620 <p>
1621 the number of deleted lines;
1622 </p>
1623 </li>
1624 <li>
1625 <p>
1626 a tab;
1627 </p>
1628 </li>
1629 <li>
1630 <p>
1631 a NUL (only exists if renamed/copied);
1632 </p>
1633 </li>
1634 <li>
1635 <p>
1636 pathname in preimage;
1637 </p>
1638 </li>
1639 <li>
1640 <p>
1641 a NUL (only exists if renamed/copied);
1642 </p>
1643 </li>
1644 <li>
1645 <p>
1646 pathname in postimage (only exists if renamed/copied);
1647 </p>
1648 </li>
1649 <li>
1650 <p>
1651 a NUL.
1652 </p>
1653 </li>
1654 </ol></div>
1655 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1656 scripts that read the output to tell if the current record being read is
1657 a single-path record or a rename/copy record without reading ahead.
1660 </div>
1666 of these operations are very useful indeed.</p></div>
1667 </div>
1673 <pre><tt>show me the differences between HEAD and the current index
1674 contents (the ones I'd write using 'git write-tree')</tt></pre>
1675 </div></div>
1676 <div class="paragraph"><p>For example, let’s say that you have worked on your working directory, updated
1677 some files in the index and are ready to commit. You want to see exactly
1679 object and compare it that way, and to do that, you just do</p></div>
1683 </div></div>
1684 <div class="paragraph"><p>Example: let’s say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had
1693 </div></div>
1695 <div class="paragraph"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to
1697 nicer for the case where you just want to check where you are.</p></div>
1698 <div class="paragraph"><p>So doing a <tt>git diff-index --cached</tt> is basically very useful when you are
1699 asking yourself "what have I already marked for being committed, and
1701 </div>
1705 the more useful of the two in that what it does can’t be emulated with
1707 The non-cached version asks the question:</p></div>
1710 <pre><tt>show me the differences between HEAD and the currently checked out
1711 tree - index contents _and_ files that aren't up-to-date</tt></pre>
1712 </div></div>
1713 <div class="paragraph"><p>which is obviously a very useful question too, since that tells you what
1715 output to a tee, but with a twist.</p></div>
1716 <div class="paragraph"><p>The twist is that if some file doesn’t match the index, we don’t have
1717 a backing store thing for it, and we use the magic "all-zero" sha1 to
1725 </div></div>
1726 <div class="paragraph"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is
1727 not up-to-date and may contain new stuff. The all-zero sha1 means that to
1728 get the real diff, you need to look at the object in the working directory
1729 directly rather than do an object-to-object diff.</p></div>
1731 <table><tr>
1734 </td>
1736 actually look at the contents of the file at all. So maybe
1738 touched it. In either case, it’s a note that you need to
1740 </tr></table>
1741 </div>
1743 <table><tr>
1746 </td>
1748 and "is still dirty in the working directory" together. You can always
1749 tell which file is in which state, since the "has been updated" ones
1750 show a valid sha1, and the "not in sync with the index" ones will
1751 always have the special all-zero sha1.</td>
1752 </tr></table>
1753 </div>
1754 </div>
1758 </div>
1762 </div>
1763 </div>
1764 </body>
1765 </html>