| blob | 96699ddba3341851c9aae92308cd894f9b79663d |
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 for each
523 passing it a comma separated list of parameters.
526 The following parameters are available:
527 </p>
531 </dt>
532 <dd>
533 <p>
534 Compute the dirstat numbers by counting the lines that have been
535 removed from the source, or added to the destination. This ignores
536 the amount of pure code movements within a file. In other words,
537 rearranging lines in a file is not counted as much as other changes.
538 This is the default behavior when no parameter is given.
539 </p>
540 </dd>
543 </dt>
544 <dd>
545 <p>
546 Compute the dirstat numbers by doing the regular line-based diff
547 analysis, and summing the removed/added line counts. (For binary
548 files, count 64-byte chunks instead, since binary files have no
551 lines within a file as much as other changes. The resulting output
553 </p>
554 </dd>
557 </dt>
558 <dd>
559 <p>
560 Compute the dirstat numbers by counting the number of files changed.
561 Each changed file counts equally in the dirstat analysis. This is
563 not have to look at the file contents at all.
564 </p>
565 </dd>
568 </dt>
569 <dd>
570 <p>
571 Count changes in a child directory for the parent directory as well.
573 reported may exceed 100%. The default (non-cumulative) behavior can
575 </p>
576 </dd>
579 </dt>
580 <dd>
581 <p>
582 An integer parameter specifies a cut-off percent (3% by default).
583 Directories contributing less than this percentage of the changes
584 are not shown in the output.
585 </p>
586 </dd>
587 </dl></div>
589 directories with less than 10% of the total amount of changed files,
590 and accumulating child directory counts in the parent directories:
592 </dd>
594 --summary
595 </dt>
596 <dd>
597 <p>
598 Output a condensed summary of extended header information
599 such as creations, renames and mode changes.
600 </p>
601 </dd>
603 --patch-with-stat
604 </dt>
605 <dd>
606 <p>
608 </p>
609 </dd>
611 -z
612 </dt>
613 <dd>
614 <p>
615 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
616 given, do not munge pathnames and use NULs as output field terminators.
617 </p>
618 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
620 respectively, and the pathname will be enclosed in double quotes if
621 any of those replacements occurred.</p></div>
622 </dd>
624 --name-only
625 </dt>
626 <dd>
627 <p>
628 Show only names of changed files.
629 </p>
630 </dd>
632 --name-status
633 </dt>
634 <dd>
635 <p>
636 Show only names and status of changed files. See the description
637 of the <tt>--diff-filter</tt> option on what the status letters mean.
638 </p>
639 </dd>
641 --submodule[=<format>]
642 </dt>
643 <dd>
644 <p>
645 Chose the output format for submodule differences. <format> can be one of
646 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
647 is used when this option is not given. <em>log</em> is the default value for this
648 option and lists the commits in that commit range like the <em>summary</em>
650 </p>
651 </dd>
653 --color[=<when>]
654 </dt>
655 <dd>
656 <p>
657 Show colored diff.
658 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
659 The default value is <tt>never</tt>.
660 </p>
661 </dd>
663 --no-color
664 </dt>
665 <dd>
666 <p>
667 Turn off colored diff.
668 It is the same as <tt>--color=never</tt>.
669 </p>
670 </dd>
672 --word-diff[=<mode>]
673 </dt>
674 <dd>
675 <p>
676 Show a word diff, using the <mode> to delimit changed words.
677 By default, words are delimited by whitespace; see
678 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
679 must be one of:
680 </p>
683 color
684 </dt>
685 <dd>
686 <p>
687 Highlight changed words using only colors. Implies <tt>--color</tt>.
688 </p>
689 </dd>
691 plain
692 </dt>
693 <dd>
694 <p>
695 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
696 attempts to escape the delimiters if they appear in the input,
697 so the output may be ambiguous.
698 </p>
699 </dd>
701 porcelain
702 </dt>
703 <dd>
704 <p>
705 Use a special line-based format intended for script
706 consumption. Added/removed/unchanged runs are printed in the
707 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
708 character at the beginning of the line and extending to the
709 end of the line. Newlines in the input are represented by a
710 tilde <tt>~</tt> on a line of its own.
711 </p>
712 </dd>
714 none
715 </dt>
716 <dd>
717 <p>
718 Disable word diff again.
719 </p>
720 </dd>
721 </dl></div>
723 highlight the changed parts in all modes if enabled.</p></div>
724 </dd>
726 --word-diff-regex=<regex>
727 </dt>
728 <dd>
729 <p>
730 Use <regex> to decide what a word is, instead of considering
731 runs of non-whitespace to be a word. Also implies
732 <tt>--word-diff</tt> unless it was already enabled.
733 </p>
735 <regex> is considered a word. Anything between these matches is
736 considered whitespace and ignored(!) for the purposes of finding
737 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
738 expression to make sure that it matches all non-whitespace characters.
739 A match that contains a newline is silently truncated(!) at the
740 newline.</p></div>
741 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
742 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
743 overrides any diff driver or configuration setting. Diff drivers
744 override configuration settings.</p></div>
745 </dd>
747 --color-words[=<regex>]
748 </dt>
749 <dd>
750 <p>
751 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
752 specified) <tt>--word-diff-regex=<regex></tt>.
753 </p>
754 </dd>
756 --no-renames
757 </dt>
758 <dd>
759 <p>
760 Turn off rename detection, even when the configuration
761 file gives the default to do so.
762 </p>
763 </dd>
765 --check
766 </dt>
767 <dd>
768 <p>
769 Warn if changes introduce trailing whitespace
770 or an indent that uses a space before a tab. Exits with
771 non-zero status if problems are found. Not compatible with
772 --exit-code.
773 </p>
774 </dd>
776 --full-index
777 </dt>
778 <dd>
779 <p>
780 Instead of the first handful of characters, show the full
782 line when generating patch format output.
783 </p>
784 </dd>
786 --binary
787 </dt>
788 <dd>
789 <p>
790 In addition to <tt>--full-index</tt>, output a binary diff that
791 can be applied with <tt>git-apply</tt>.
792 </p>
793 </dd>
795 --abbrev[=<n>]
796 </dt>
797 <dd>
798 <p>
799 Instead of showing the full 40-byte hexadecimal object
800 name in diff-raw format output and diff-tree header
801 lines, show only a partial prefix. This is
802 independent of the <tt>--full-index</tt> option above, which controls
803 the diff-patch output format. Non default number of
804 digits can be specified with <tt>--abbrev=<n></tt>.
805 </p>
806 </dd>
808 -B[<n>][/<m>]
809 </dt>
811 --break-rewrites[=[<n>][/<m>]]
812 </dt>
813 <dd>
814 <p>
815 Break complete rewrite changes into pairs of delete and
816 create. This serves two purposes:
817 </p>
819 not as a series of deletion and insertion mixed together with a very
820 few lines that happen to match textually as the context, but as a
821 single deletion of everything old followed by a single insertion of
822 everything new, and the number <tt>m</tt> controls this aspect of the -B
823 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
824 original should remain in the result for git to consider it a total
825 rewrite (i.e. otherwise the resulting patch will be a series of
826 deletion and insertion mixed together with context lines).</p></div>
828 source of a rename (usually -M only considers a file that disappeared
829 as the source of a rename), and the number <tt>n</tt> controls this aspect of
830 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
831 addition and deletion compared to 20% or more of the file’s size are
832 eligible for being picked up as a possible source of a rename to
833 another file.</p></div>
834 </dd>
836 -M[<n>]
837 </dt>
839 --find-renames[=<n>]
840 </dt>
841 <dd>
842 <p>
843 Detect renames.
844 If <tt>n</tt> is specified, it is a threshold on the similarity
845 index (i.e. amount of addition/deletions compared to the
846 file’s size). For example, <tt>-M90%</tt> means git should consider a
847 delete/add pair to be a rename if more than 90% of the file
848 hasn’t changed.
849 </p>
850 </dd>
852 -C[<n>]
853 </dt>
855 --find-copies[=<n>]
856 </dt>
857 <dd>
858 <p>
859 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
860 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
861 </p>
862 </dd>
864 --find-copies-harder
865 </dt>
866 <dd>
867 <p>
868 For performance reasons, by default, <tt>-C</tt> option finds copies only
869 if the original file of the copy was modified in the same
870 changeset. This flag makes the command
871 inspect unmodified files as candidates for the source of
872 copy. This is a very expensive operation for large
873 projects, so use it with caution. Giving more than one
874 <tt>-C</tt> option has the same effect.
875 </p>
876 </dd>
878 -D
879 </dt>
881 --irreversible-delete
882 </dt>
883 <dd>
884 <p>
885 Omit the preimage for deletes, i.e. print only the header but not
886 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
887 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
888 solely for people who want to just concentrate on reviewing the
889 text after the change. In addition, the output obviously lack
890 enough information to apply such a patch in reverse, even manually,
891 hence the name of the option.
892 </p>
893 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
894 of a delete/create pair.</p></div>
895 </dd>
897 -l<num>
898 </dt>
899 <dd>
900 <p>
901 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
902 is the number of potential rename/copy targets. This
903 option prevents rename/copy detection from running if
904 the number of rename/copy targets exceeds the specified
905 number.
906 </p>
907 </dd>
909 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
910 </dt>
911 <dd>
912 <p>
913 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
914 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
915 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
916 are Unmerged (<tt>U</tt>), are
917 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
918 Any combination of the filter characters (including none) can be used.
919 When <tt>*</tt> (All-or-none) is added to the combination, all
920 paths are selected if there is any file that matches
921 other criteria in the comparison; if there is no file
922 that matches other criteria, nothing is selected.
923 </p>
924 </dd>
926 -S<string>
927 </dt>
928 <dd>
929 <p>
930 Look for differences that introduce or remove an instance of
931 <string>. Note that this is different than the string simply
932 appearing in diff output; see the <em>pickaxe</em> entry in
934 </p>
935 </dd>
937 -G<regex>
938 </dt>
939 <dd>
940 <p>
941 Look for differences whose added or removed line matches
942 the given <regex>.
943 </p>
944 </dd>
946 --pickaxe-all
947 </dt>
948 <dd>
949 <p>
950 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
951 changeset, not just the files that contain the change
952 in <string>.
953 </p>
954 </dd>
956 --pickaxe-regex
957 </dt>
958 <dd>
959 <p>
960 Make the <string> not a plain string but an extended POSIX
961 regex to match.
962 </p>
963 </dd>
965 -O<orderfile>
966 </dt>
967 <dd>
968 <p>
969 Output the patch in the order specified in the
970 <orderfile>, which has one shell glob pattern per line.
971 </p>
972 </dd>
974 -R
975 </dt>
976 <dd>
977 <p>
978 Swap two inputs; that is, show differences from index or
979 on-disk file to tree contents.
980 </p>
981 </dd>
983 --relative[=<path>]
984 </dt>
985 <dd>
986 <p>
987 When run from a subdirectory of the project, it can be
988 told to exclude changes outside the directory and show
989 pathnames relative to it with this option. When you are
990 not in a subdirectory (e.g. in a bare repository), you
991 can name which subdirectory to make the output relative
992 to by giving a <path> as an argument.
993 </p>
994 </dd>
996 -a
997 </dt>
999 --text
1000 </dt>
1001 <dd>
1002 <p>
1003 Treat all files as text.
1004 </p>
1005 </dd>
1007 --ignore-space-at-eol
1008 </dt>
1009 <dd>
1010 <p>
1011 Ignore changes in whitespace at EOL.
1012 </p>
1013 </dd>
1015 -b
1016 </dt>
1018 --ignore-space-change
1019 </dt>
1020 <dd>
1021 <p>
1022 Ignore changes in amount of whitespace. This ignores whitespace
1023 at line end, and considers all other sequences of one or
1024 more whitespace characters to be equivalent.
1025 </p>
1026 </dd>
1028 -w
1029 </dt>
1031 --ignore-all-space
1032 </dt>
1033 <dd>
1034 <p>
1035 Ignore whitespace when comparing lines. This ignores
1036 differences even if one line has whitespace where the other
1037 line has none.
1038 </p>
1039 </dd>
1041 --inter-hunk-context=<lines>
1042 </dt>
1043 <dd>
1044 <p>
1045 Show the context between diff hunks, up to the specified number
1046 of lines, thereby fusing hunks that are close to each other.
1047 </p>
1048 </dd>
1050 --exit-code
1051 </dt>
1052 <dd>
1053 <p>
1054 Make the program exit with codes similar to diff(1).
1055 That is, it exits with 1 if there were differences and
1056 0 means no differences.
1057 </p>
1058 </dd>
1060 --quiet
1061 </dt>
1062 <dd>
1063 <p>
1064 Disable all output of the program. Implies <tt>--exit-code</tt>.
1065 </p>
1066 </dd>
1068 --ext-diff
1069 </dt>
1070 <dd>
1071 <p>
1072 Allow an external diff helper to be executed. If you set an
1075 </p>
1076 </dd>
1078 --no-ext-diff
1079 </dt>
1080 <dd>
1081 <p>
1082 Disallow external diff drivers.
1083 </p>
1084 </dd>
1086 --ignore-submodules[=<when>]
1087 </dt>
1088 <dd>
1089 <p>
1090 Ignore changes to submodules in the diff generation. <when> can be
1093 untracked or modified files or its HEAD differs from the commit recorded
1094 in the superproject and can be used to override any settings of the
1095 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1097 contain untracked content (but they are still scanned for modified
1099 only changes to the commits stored in the superproject are shown (this was
1101 </p>
1102 </dd>
1104 --src-prefix=<prefix>
1105 </dt>
1106 <dd>
1107 <p>
1109 </p>
1110 </dd>
1112 --dst-prefix=<prefix>
1113 </dt>
1114 <dd>
1115 <p>
1117 </p>
1118 </dd>
1120 --no-prefix
1121 </dt>
1122 <dd>
1123 <p>
1124 Do not show any source or destination prefix.
1125 </p>
1126 </dd>
1127 </dl></div>
1132 <tree-ish>
1133 </dt>
1134 <dd>
1135 <p>
1136 The id of a tree object to diff against.
1137 </p>
1138 </dd>
1140 --cached
1141 </dt>
1142 <dd>
1143 <p>
1144 do not consider the on-disk file at all
1145 </p>
1146 </dd>
1148 -m
1149 </dt>
1150 <dd>
1151 <p>
1152 By default, files recorded in the index but not checked
1153 out are reported as deleted. This flag makes
1154 <em>git diff-index</em> say that all non-checked-out files are up
1155 to date.
1156 </p>
1157 </dd>
1158 </dl></div>
1159 </div>
1165 compared differs:</p></div>
1168 git-diff-index <tree-ish>
1169 </dt>
1170 <dd>
1171 <p>
1172 compares the <tree-ish> and the files on the filesystem.
1173 </p>
1174 </dd>
1176 git-diff-index --cached <tree-ish>
1177 </dt>
1178 <dd>
1179 <p>
1180 compares the <tree-ish> and the index.
1181 </p>
1182 </dd>
1184 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1185 </dt>
1186 <dd>
1187 <p>
1188 compares the trees named by the two arguments.
1189 </p>
1190 </dd>
1192 git-diff-files [<pattern>…]
1193 </dt>
1194 <dd>
1195 <p>
1196 compares the index and the files on the filesystem.
1197 </p>
1198 </dd>
1199 </dl></div>
1200 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1201 what is being compared. After that, all the commands print one output
1202 line per changed file.</p></div>
1206 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1207 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1208 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1209 create :000000 100644 0000000... 1234567... A file4
1210 delete :100644 000000 1234567... 0000000... D file5
1211 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1212 </div></div>
1215 <li>
1216 <p>
1217 a colon.
1218 </p>
1219 </li>
1220 <li>
1221 <p>
1223 </p>
1224 </li>
1225 <li>
1226 <p>
1227 a space.
1228 </p>
1229 </li>
1230 <li>
1231 <p>
1233 </p>
1234 </li>
1235 <li>
1236 <p>
1237 a space.
1238 </p>
1239 </li>
1240 <li>
1241 <p>
1243 </p>
1244 </li>
1245 <li>
1246 <p>
1247 a space.
1248 </p>
1249 </li>
1250 <li>
1251 <p>
1253 </p>
1254 </li>
1255 <li>
1256 <p>
1257 a space.
1258 </p>
1259 </li>
1260 <li>
1261 <p>
1263 </p>
1264 </li>
1265 <li>
1266 <p>
1267 a tab or a NUL when <em>-z</em> option is used.
1268 </p>
1269 </li>
1270 <li>
1271 <p>
1273 </p>
1274 </li>
1275 <li>
1276 <p>
1277 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1278 </p>
1279 </li>
1280 <li>
1281 <p>
1283 </p>
1284 </li>
1285 <li>
1286 <p>
1287 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1288 </p>
1289 </li>
1290 </ol></div>
1293 <li>
1294 <p>
1295 A: addition of a file
1296 </p>
1297 </li>
1298 <li>
1299 <p>
1300 C: copy of a file into a new one
1301 </p>
1302 </li>
1303 <li>
1304 <p>
1305 D: deletion of a file
1306 </p>
1307 </li>
1308 <li>
1309 <p>
1310 M: modification of the contents or mode of a file
1311 </p>
1312 </li>
1313 <li>
1314 <p>
1315 R: renaming of a file
1316 </p>
1317 </li>
1318 <li>
1319 <p>
1320 T: change in the type of the file
1321 </p>
1322 </li>
1323 <li>
1324 <p>
1325 U: file is unmerged (you must complete the merge before it can
1326 be committed)
1327 </p>
1328 </li>
1329 <li>
1330 <p>
1332 </p>
1333 </li>
1334 </ul></div>
1336 percentage of similarity between the source and target of the move or
1337 copy), and are the only ones to be so.</p></div>
1338 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1339 and it is out of sync with the index.</p></div>
1343 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1344 </div></div>
1345 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1346 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1347 respectively.</p></div>
1348 </div>
1352 can take <em>-c</em> or <em>--cc</em> option
1353 to generate diff output also for merge commits. The output differs
1354 from the format described above in the following way:</p></div>
1356 <li>
1357 <p>
1358 there is a colon for each parent
1359 </p>
1360 </li>
1361 <li>
1362 <p>
1364 </p>
1365 </li>
1366 <li>
1367 <p>
1368 status is concatenated status characters for each parent
1369 </p>
1370 </li>
1371 <li>
1372 <p>
1374 </p>
1375 </li>
1376 <li>
1377 <p>
1379 </p>
1380 </li>
1381 </ol></div>
1385 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1386 </div></div>
1387 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1388 all parents.</p></div>
1389 </div>
1395 do not produce the output described above; instead they produce a
1396 patch file. You can customize the creation of such patches via the
1397 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1398 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1399 diff format:</p></div>
1401 <li>
1402 <p>
1404 </p>
1407 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1408 </div></div>
1409 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1410 involved. Especially, even for a creation or a deletion,
1411 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1412 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1413 name of the source file of the rename/copy and the name of
1414 the file that rename/copy produces, respectively.</p></div>
1415 </li>
1416 <li>
1417 <p>
1418 It is followed by one or more extended header lines:
1419 </p>
1422 <pre><tt>old mode <mode>
1423 new mode <mode>
1424 deleted file mode <mode>
1425 new file mode <mode>
1426 copy from <path>
1427 copy to <path>
1428 rename from <path>
1429 rename to <path>
1430 similarity index <number>
1431 dissimilarity index <number>
1432 index <hash>..<hash> <mode></tt></pre>
1433 </div></div>
1434 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1435 and file permission bits.</p></div>
1436 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1438 the dissimilarity index is the percentage of changed lines. It
1439 is a rounded down integer, followed by a percent sign. The
1440 similarity index value of 100% is thus reserved for two equal
1441 files, while 100% dissimilarity means that no line from the old
1442 file made it into the new one.</p></div>
1443 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1444 The <mode> is included if the file mode does not change; otherwise,
1445 separate lines indicate the old and the new mode.</p></div>
1446 </li>
1447 <li>
1448 <p>
1449 TAB, LF, double quote and backslash characters in pathnames
1451 If there is need for such substitution then the whole
1452 pathname is put in double quotes.
1453 </p>
1454 </li>
1455 <li>
1456 <p>
1459 It is incorrect to apply each change to each file sequentially. For
1460 example, this patch will swap a and b:
1461 </p>
1464 <pre><tt>diff --git a/a b/b
1465 rename from a
1466 rename to b
1467 diff --git a/b b/a
1468 rename from b
1469 rename to a</tt></pre>
1470 </div></div>
1471 </li>
1472 </ol></div>
1473 </div>
1476 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1479 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1480 of these commands to force generation of diffs with individual parents
1481 of a merge.</p></div>
1485 <pre><tt>diff --combined describe.c
1486 index fabadb8,cc95eb0..4866510
1487 --- a/describe.c
1488 +++ b/describe.c
1491 }
1493 - static void describe(char *arg)
1494 -static void describe(struct commit *cmit, int last_one)
1495 ++static void describe(char *arg, int last_one)
1496 {
1497 + unsigned char sha1[20];
1498 + struct commit *cmit;
1499 struct commit_list *list;
1500 static int initialized = 0;
1501 struct commit_name *n;
1504 + usage(describe_usage);
1505 + cmit = lookup_commit_reference(sha1);
1506 + if (!cmit)
1507 + usage(describe_usage);
1508 +
1509 if (!initialized) {
1510 initialized = 1;
1511 for_each_ref(get_name);</tt></pre>
1512 </div></div>
1514 <li>
1515 <p>
1516 It is preceded with a "git diff" header, that looks like
1518 </p>
1522 </div></div>
1527 </div></div>
1528 </li>
1529 <li>
1530 <p>
1531 It is followed by one or more extended header lines
1532 (this example shows a merge with two parents):
1533 </p>
1540 </div></div>
1541 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1543 information about detected contents movement (renames and
1544 copying detection) are designed to work with diff of two
1546 </li>
1547 <li>
1548 <p>
1549 It is followed by two-line from-file/to-file header
1550 </p>
1553 <pre><tt>--- a/file
1554 +++ b/file</tt></pre>
1555 </div></div>
1558 files.</p></div>
1559 </li>
1560 <li>
1561 <p>
1562 Chunk header format is modified to prevent people from
1564 was created for review of merge commit changes, and was not
1565 meant for apply. The change is similar to the change in the
1567 </p>
1570 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1571 </div></div>
1573 header for combined diff format.</p></div>
1574 </li>
1575 </ol></div>
1577 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
1579 compares two or more files file1, file2,… with one file X, and
1580 shows how X differs from each of fileN. One column for each of
1581 fileN is prepended to the output line to note how X’s line is
1582 different from it.</p></div>
1583 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1585 in the column N means that the line appears in the result,
1586 and fileN does not have that line (in other words, the line was
1587 added, from the point of view of that parent).</p></div>
1591 in either file1 nor file2). Also eight other lines are the same
1593 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1594 merge commit with the merge result (i.e. file1..fileN are the
1596 two unresolved merge parents with the working tree file
1599 </div>
1602 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1604 output. These options can be combined with other options, such as
1606 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1607 formats the pathnames compactly by combining common prefix and suffix of
1613 </div></div>
1614 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1616 like this:</p></div>
1621 </div></div>
1624 <li>
1625 <p>
1626 the number of added lines;
1627 </p>
1628 </li>
1629 <li>
1630 <p>
1631 a tab;
1632 </p>
1633 </li>
1634 <li>
1635 <p>
1636 the number of deleted lines;
1637 </p>
1638 </li>
1639 <li>
1640 <p>
1641 a tab;
1642 </p>
1643 </li>
1644 <li>
1645 <p>
1646 pathname (possibly with rename/copy information);
1647 </p>
1648 </li>
1649 <li>
1650 <p>
1651 a newline.
1652 </p>
1653 </li>
1654 </ol></div>
1655 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1660 </div></div>
1663 <li>
1664 <p>
1665 the number of added lines;
1666 </p>
1667 </li>
1668 <li>
1669 <p>
1670 a tab;
1671 </p>
1672 </li>
1673 <li>
1674 <p>
1675 the number of deleted lines;
1676 </p>
1677 </li>
1678 <li>
1679 <p>
1680 a tab;
1681 </p>
1682 </li>
1683 <li>
1684 <p>
1685 a NUL (only exists if renamed/copied);
1686 </p>
1687 </li>
1688 <li>
1689 <p>
1690 pathname in preimage;
1691 </p>
1692 </li>
1693 <li>
1694 <p>
1695 a NUL (only exists if renamed/copied);
1696 </p>
1697 </li>
1698 <li>
1699 <p>
1700 pathname in postimage (only exists if renamed/copied);
1701 </p>
1702 </li>
1703 <li>
1704 <p>
1705 a NUL.
1706 </p>
1707 </li>
1708 </ol></div>
1709 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1710 scripts that read the output to tell if the current record being read is
1711 a single-path record or a rename/copy record without reading ahead.
1714 </div>
1720 of these operations are very useful indeed.</p></div>
1721 </div>
1727 <pre><tt>show me the differences between HEAD and the current index
1728 contents (the ones I'd write using 'git write-tree')</tt></pre>
1729 </div></div>
1730 <div class="paragraph"><p>For example, let’s say that you have worked on your working directory, updated
1731 some files in the index and are ready to commit. You want to see exactly
1733 object and compare it that way, and to do that, you just do</p></div>
1737 </div></div>
1738 <div class="paragraph"><p>Example: let’s say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had
1747 </div></div>
1749 <div class="paragraph"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to
1751 nicer for the case where you just want to check where you are.</p></div>
1752 <div class="paragraph"><p>So doing a <tt>git diff-index --cached</tt> is basically very useful when you are
1753 asking yourself "what have I already marked for being committed, and
1755 </div>
1759 the more useful of the two in that what it does can’t be emulated with
1761 The non-cached version asks the question:</p></div>
1764 <pre><tt>show me the differences between HEAD and the currently checked out
1765 tree - index contents _and_ files that aren't up-to-date</tt></pre>
1766 </div></div>
1767 <div class="paragraph"><p>which is obviously a very useful question too, since that tells you what
1769 output to a tee, but with a twist.</p></div>
1770 <div class="paragraph"><p>The twist is that if some file doesn’t match the index, we don’t have
1771 a backing store thing for it, and we use the magic "all-zero" sha1 to
1779 </div></div>
1780 <div class="paragraph"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is
1781 not up-to-date and may contain new stuff. The all-zero sha1 means that to
1782 get the real diff, you need to look at the object in the working directory
1783 directly rather than do an object-to-object diff.</p></div>
1785 <table><tr>
1788 </td>
1790 actually look at the contents of the file at all. So maybe
1792 touched it. In either case, it’s a note that you need to
1794 </tr></table>
1795 </div>
1797 <table><tr>
1800 </td>
1802 and "is still dirty in the working directory" together. You can always
1803 tell which file is in which state, since the "has been updated" ones
1804 show a valid sha1, and the "not in sync with the index" ones will
1805 always have the special all-zero sha1.</td>
1806 </tr></table>
1807 </div>
1808 </div>
1812 </div>
1816 </div>
1817 </div>
1818 </body>
1819 </html>