| blob | b46400976d03b6888eb041a39db2618d4442abf7 |
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>
418 <div class="verseblock-content"><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</div>
420 </div></div>
421 </div>
425 object with the content of the current index and, optionally
426 ignoring the stat state of the file on disk. When paths are
427 specified, compares only those named paths. Otherwise all
428 entries in the index are compared.</p></div>
429 </div>
434 -p
435 </dt>
437 -u
438 </dt>
440 --patch
441 </dt>
442 <dd>
443 <p>
444 Generate patch (see section on generating patches).
446 </p>
447 </dd>
450 </dt>
453 </dt>
454 <dd>
455 <p>
457 the usual three.
459 </p>
460 </dd>
462 --raw
463 </dt>
464 <dd>
465 <p>
466 Generate the raw format.
467 This is the default.
468 </p>
469 </dd>
471 --patch-with-raw
472 </dt>
473 <dd>
474 <p>
476 </p>
477 </dd>
479 --patience
480 </dt>
481 <dd>
482 <p>
483 Generate a diff using the "patience diff" algorithm.
484 </p>
485 </dd>
488 </dt>
489 <dd>
490 <p>
491 Generate a diffstat. You can override the default
493 The width of the filename part can be controlled by
494 giving another width to it separated by a comma.
498 </p>
499 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
500 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
501 </dd>
503 --numstat
504 </dt>
505 <dd>
506 <p>
508 deleted lines in decimal notation and pathname without
509 abbreviation, to make it more machine friendly. For
512 </p>
513 </dd>
515 --shortstat
516 </dt>
517 <dd>
518 <p>
520 number of modified files, as well as number of added and deleted
521 lines.
522 </p>
523 </dd>
526 </dt>
527 <dd>
528 <p>
529 Output the distribution of relative amount of changes for each
531 passing it a comma separated list of parameters.
534 The following parameters are available:
535 </p>
539 </dt>
540 <dd>
541 <p>
542 Compute the dirstat numbers by counting the lines that have been
543 removed from the source, or added to the destination. This ignores
544 the amount of pure code movements within a file. In other words,
545 rearranging lines in a file is not counted as much as other changes.
546 This is the default behavior when no parameter is given.
547 </p>
548 </dd>
551 </dt>
552 <dd>
553 <p>
554 Compute the dirstat numbers by doing the regular line-based diff
555 analysis, and summing the removed/added line counts. (For binary
556 files, count 64-byte chunks instead, since binary files have no
559 lines within a file as much as other changes. The resulting output
561 </p>
562 </dd>
565 </dt>
566 <dd>
567 <p>
568 Compute the dirstat numbers by counting the number of files changed.
569 Each changed file counts equally in the dirstat analysis. This is
571 not have to look at the file contents at all.
572 </p>
573 </dd>
576 </dt>
577 <dd>
578 <p>
579 Count changes in a child directory for the parent directory as well.
581 reported may exceed 100%. The default (non-cumulative) behavior can
583 </p>
584 </dd>
587 </dt>
588 <dd>
589 <p>
590 An integer parameter specifies a cut-off percent (3% by default).
591 Directories contributing less than this percentage of the changes
592 are not shown in the output.
593 </p>
594 </dd>
595 </dl></div>
597 directories with less than 10% of the total amount of changed files,
598 and accumulating child directory counts in the parent directories:
600 </dd>
602 --summary
603 </dt>
604 <dd>
605 <p>
606 Output a condensed summary of extended header information
607 such as creations, renames and mode changes.
608 </p>
609 </dd>
611 --patch-with-stat
612 </dt>
613 <dd>
614 <p>
616 </p>
617 </dd>
619 -z
620 </dt>
621 <dd>
622 <p>
623 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
624 given, do not munge pathnames and use NULs as output field terminators.
625 </p>
626 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
628 respectively, and the pathname will be enclosed in double quotes if
629 any of those replacements occurred.</p></div>
630 </dd>
632 --name-only
633 </dt>
634 <dd>
635 <p>
636 Show only names of changed files.
637 </p>
638 </dd>
640 --name-status
641 </dt>
642 <dd>
643 <p>
644 Show only names and status of changed files. See the description
645 of the <tt>--diff-filter</tt> option on what the status letters mean.
646 </p>
647 </dd>
649 --submodule[=<format>]
650 </dt>
651 <dd>
652 <p>
653 Chose the output format for submodule differences. <format> can be one of
654 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
655 is used when this option is not given. <em>log</em> is the default value for this
656 option and lists the commits in that commit range like the <em>summary</em>
658 </p>
659 </dd>
661 --color[=<when>]
662 </dt>
663 <dd>
664 <p>
665 Show colored diff.
666 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
667 The default value is <tt>never</tt>.
668 </p>
669 </dd>
671 --no-color
672 </dt>
673 <dd>
674 <p>
675 Turn off colored diff.
676 It is the same as <tt>--color=never</tt>.
677 </p>
678 </dd>
680 --word-diff[=<mode>]
681 </dt>
682 <dd>
683 <p>
684 Show a word diff, using the <mode> to delimit changed words.
685 By default, words are delimited by whitespace; see
686 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
687 must be one of:
688 </p>
691 color
692 </dt>
693 <dd>
694 <p>
695 Highlight changed words using only colors. Implies <tt>--color</tt>.
696 </p>
697 </dd>
699 plain
700 </dt>
701 <dd>
702 <p>
703 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
704 attempts to escape the delimiters if they appear in the input,
705 so the output may be ambiguous.
706 </p>
707 </dd>
709 porcelain
710 </dt>
711 <dd>
712 <p>
713 Use a special line-based format intended for script
714 consumption. Added/removed/unchanged runs are printed in the
715 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
716 character at the beginning of the line and extending to the
717 end of the line. Newlines in the input are represented by a
718 tilde <tt>~</tt> on a line of its own.
719 </p>
720 </dd>
722 none
723 </dt>
724 <dd>
725 <p>
726 Disable word diff again.
727 </p>
728 </dd>
729 </dl></div>
731 highlight the changed parts in all modes if enabled.</p></div>
732 </dd>
734 --word-diff-regex=<regex>
735 </dt>
736 <dd>
737 <p>
738 Use <regex> to decide what a word is, instead of considering
739 runs of non-whitespace to be a word. Also implies
740 <tt>--word-diff</tt> unless it was already enabled.
741 </p>
743 <regex> is considered a word. Anything between these matches is
744 considered whitespace and ignored(!) for the purposes of finding
745 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
746 expression to make sure that it matches all non-whitespace characters.
747 A match that contains a newline is silently truncated(!) at the
748 newline.</p></div>
749 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
750 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
751 overrides any diff driver or configuration setting. Diff drivers
752 override configuration settings.</p></div>
753 </dd>
755 --color-words[=<regex>]
756 </dt>
757 <dd>
758 <p>
759 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
760 specified) <tt>--word-diff-regex=<regex></tt>.
761 </p>
762 </dd>
764 --no-renames
765 </dt>
766 <dd>
767 <p>
768 Turn off rename detection, even when the configuration
769 file gives the default to do so.
770 </p>
771 </dd>
773 --check
774 </dt>
775 <dd>
776 <p>
777 Warn if changes introduce whitespace errors. What are
778 considered whitespace errors is controlled by <tt>core.whitespace</tt>
779 configuration. By default, trailing whitespaces (including
780 lines that solely consist of whitespaces) and a space character
781 that is immediately followed by a tab character inside the
782 initial indent of the line are considered whitespace errors.
783 Exits with non-zero status if problems are found. Not compatible
784 with --exit-code.
785 </p>
786 </dd>
788 --full-index
789 </dt>
790 <dd>
791 <p>
792 Instead of the first handful of characters, show the full
794 line when generating patch format output.
795 </p>
796 </dd>
798 --binary
799 </dt>
800 <dd>
801 <p>
802 In addition to <tt>--full-index</tt>, output a binary diff that
803 can be applied with <tt>git-apply</tt>.
804 </p>
805 </dd>
807 --abbrev[=<n>]
808 </dt>
809 <dd>
810 <p>
811 Instead of showing the full 40-byte hexadecimal object
812 name in diff-raw format output and diff-tree header
813 lines, show only a partial prefix. This is
814 independent of the <tt>--full-index</tt> option above, which controls
815 the diff-patch output format. Non default number of
816 digits can be specified with <tt>--abbrev=<n></tt>.
817 </p>
818 </dd>
820 -B[<n>][/<m>]
821 </dt>
823 --break-rewrites[=[<n>][/<m>]]
824 </dt>
825 <dd>
826 <p>
827 Break complete rewrite changes into pairs of delete and
828 create. This serves two purposes:
829 </p>
831 not as a series of deletion and insertion mixed together with a very
832 few lines that happen to match textually as the context, but as a
833 single deletion of everything old followed by a single insertion of
834 everything new, and the number <tt>m</tt> controls this aspect of the -B
835 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
836 original should remain in the result for git to consider it a total
837 rewrite (i.e. otherwise the resulting patch will be a series of
838 deletion and insertion mixed together with context lines).</p></div>
840 source of a rename (usually -M only considers a file that disappeared
841 as the source of a rename), and the number <tt>n</tt> controls this aspect of
842 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
843 addition and deletion compared to 20% or more of the file’s size are
844 eligible for being picked up as a possible source of a rename to
845 another file.</p></div>
846 </dd>
848 -M[<n>]
849 </dt>
851 --find-renames[=<n>]
852 </dt>
853 <dd>
854 <p>
855 Detect renames.
856 If <tt>n</tt> is specified, it is a threshold on the similarity
857 index (i.e. amount of addition/deletions compared to the
858 file’s size). For example, <tt>-M90%</tt> means git should consider a
859 delete/add pair to be a rename if more than 90% of the file
860 hasn’t changed.
861 </p>
862 </dd>
864 -C[<n>]
865 </dt>
867 --find-copies[=<n>]
868 </dt>
869 <dd>
870 <p>
871 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
872 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
873 </p>
874 </dd>
876 --find-copies-harder
877 </dt>
878 <dd>
879 <p>
880 For performance reasons, by default, <tt>-C</tt> option finds copies only
881 if the original file of the copy was modified in the same
882 changeset. This flag makes the command
883 inspect unmodified files as candidates for the source of
884 copy. This is a very expensive operation for large
885 projects, so use it with caution. Giving more than one
886 <tt>-C</tt> option has the same effect.
887 </p>
888 </dd>
890 -D
891 </dt>
893 --irreversible-delete
894 </dt>
895 <dd>
896 <p>
897 Omit the preimage for deletes, i.e. print only the header but not
898 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
899 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
900 solely for people who want to just concentrate on reviewing the
901 text after the change. In addition, the output obviously lack
902 enough information to apply such a patch in reverse, even manually,
903 hence the name of the option.
904 </p>
905 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
906 of a delete/create pair.</p></div>
907 </dd>
909 -l<num>
910 </dt>
911 <dd>
912 <p>
913 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
914 is the number of potential rename/copy targets. This
915 option prevents rename/copy detection from running if
916 the number of rename/copy targets exceeds the specified
917 number.
918 </p>
919 </dd>
921 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
922 </dt>
923 <dd>
924 <p>
925 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
926 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
927 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
928 are Unmerged (<tt>U</tt>), are
929 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
930 Any combination of the filter characters (including none) can be used.
931 When <tt>*</tt> (All-or-none) is added to the combination, all
932 paths are selected if there is any file that matches
933 other criteria in the comparison; if there is no file
934 that matches other criteria, nothing is selected.
935 </p>
936 </dd>
938 -S<string>
939 </dt>
940 <dd>
941 <p>
942 Look for differences that introduce or remove an instance of
943 <string>. Note that this is different than the string simply
944 appearing in diff output; see the <em>pickaxe</em> entry in
946 </p>
947 </dd>
949 -G<regex>
950 </dt>
951 <dd>
952 <p>
953 Look for differences whose added or removed line matches
954 the given <regex>.
955 </p>
956 </dd>
958 --pickaxe-all
959 </dt>
960 <dd>
961 <p>
962 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
963 changeset, not just the files that contain the change
964 in <string>.
965 </p>
966 </dd>
968 --pickaxe-regex
969 </dt>
970 <dd>
971 <p>
972 Make the <string> not a plain string but an extended POSIX
973 regex to match.
974 </p>
975 </dd>
977 -O<orderfile>
978 </dt>
979 <dd>
980 <p>
981 Output the patch in the order specified in the
982 <orderfile>, which has one shell glob pattern per line.
983 </p>
984 </dd>
986 -R
987 </dt>
988 <dd>
989 <p>
990 Swap two inputs; that is, show differences from index or
991 on-disk file to tree contents.
992 </p>
993 </dd>
995 --relative[=<path>]
996 </dt>
997 <dd>
998 <p>
999 When run from a subdirectory of the project, it can be
1000 told to exclude changes outside the directory and show
1001 pathnames relative to it with this option. When you are
1002 not in a subdirectory (e.g. in a bare repository), you
1003 can name which subdirectory to make the output relative
1004 to by giving a <path> as an argument.
1005 </p>
1006 </dd>
1008 -a
1009 </dt>
1011 --text
1012 </dt>
1013 <dd>
1014 <p>
1015 Treat all files as text.
1016 </p>
1017 </dd>
1019 --ignore-space-at-eol
1020 </dt>
1021 <dd>
1022 <p>
1023 Ignore changes in whitespace at EOL.
1024 </p>
1025 </dd>
1027 -b
1028 </dt>
1030 --ignore-space-change
1031 </dt>
1032 <dd>
1033 <p>
1034 Ignore changes in amount of whitespace. This ignores whitespace
1035 at line end, and considers all other sequences of one or
1036 more whitespace characters to be equivalent.
1037 </p>
1038 </dd>
1040 -w
1041 </dt>
1043 --ignore-all-space
1044 </dt>
1045 <dd>
1046 <p>
1047 Ignore whitespace when comparing lines. This ignores
1048 differences even if one line has whitespace where the other
1049 line has none.
1050 </p>
1051 </dd>
1053 --inter-hunk-context=<lines>
1054 </dt>
1055 <dd>
1056 <p>
1057 Show the context between diff hunks, up to the specified number
1058 of lines, thereby fusing hunks that are close to each other.
1059 </p>
1060 </dd>
1062 --exit-code
1063 </dt>
1064 <dd>
1065 <p>
1066 Make the program exit with codes similar to diff(1).
1067 That is, it exits with 1 if there were differences and
1068 0 means no differences.
1069 </p>
1070 </dd>
1072 --quiet
1073 </dt>
1074 <dd>
1075 <p>
1076 Disable all output of the program. Implies <tt>--exit-code</tt>.
1077 </p>
1078 </dd>
1080 --ext-diff
1081 </dt>
1082 <dd>
1083 <p>
1084 Allow an external diff helper to be executed. If you set an
1087 </p>
1088 </dd>
1090 --no-ext-diff
1091 </dt>
1092 <dd>
1093 <p>
1094 Disallow external diff drivers.
1095 </p>
1096 </dd>
1098 --textconv
1099 </dt>
1101 --no-textconv
1102 </dt>
1103 <dd>
1104 <p>
1105 Allow (or disallow) external text conversion filters to be run
1107 details. Because textconv filters are typically a one-way
1108 conversion, the resulting diff is suitable for human
1109 consumption, but cannot be applied. For this reason, textconv
1111 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1112 diff plumbing commands.
1113 </p>
1114 </dd>
1116 --ignore-submodules[=<when>]
1117 </dt>
1118 <dd>
1119 <p>
1120 Ignore changes to submodules in the diff generation. <when> can be
1123 untracked or modified files or its HEAD differs from the commit recorded
1124 in the superproject and can be used to override any settings of the
1125 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1127 contain untracked content (but they are still scanned for modified
1129 only changes to the commits stored in the superproject are shown (this was
1131 </p>
1132 </dd>
1134 --src-prefix=<prefix>
1135 </dt>
1136 <dd>
1137 <p>
1139 </p>
1140 </dd>
1142 --dst-prefix=<prefix>
1143 </dt>
1144 <dd>
1145 <p>
1147 </p>
1148 </dd>
1150 --no-prefix
1151 </dt>
1152 <dd>
1153 <p>
1154 Do not show any source or destination prefix.
1155 </p>
1156 </dd>
1157 </dl></div>
1162 <tree-ish>
1163 </dt>
1164 <dd>
1165 <p>
1166 The id of a tree object to diff against.
1167 </p>
1168 </dd>
1170 --cached
1171 </dt>
1172 <dd>
1173 <p>
1174 do not consider the on-disk file at all
1175 </p>
1176 </dd>
1178 -m
1179 </dt>
1180 <dd>
1181 <p>
1182 By default, files recorded in the index but not checked
1183 out are reported as deleted. This flag makes
1184 <em>git diff-index</em> say that all non-checked-out files are up
1185 to date.
1186 </p>
1187 </dd>
1188 </dl></div>
1189 </div>
1195 compared differs:</p></div>
1198 git-diff-index <tree-ish>
1199 </dt>
1200 <dd>
1201 <p>
1202 compares the <tree-ish> and the files on the filesystem.
1203 </p>
1204 </dd>
1206 git-diff-index --cached <tree-ish>
1207 </dt>
1208 <dd>
1209 <p>
1210 compares the <tree-ish> and the index.
1211 </p>
1212 </dd>
1214 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1215 </dt>
1216 <dd>
1217 <p>
1218 compares the trees named by the two arguments.
1219 </p>
1220 </dd>
1222 git-diff-files [<pattern>…]
1223 </dt>
1224 <dd>
1225 <p>
1226 compares the index and the files on the filesystem.
1227 </p>
1228 </dd>
1229 </dl></div>
1230 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1231 what is being compared. After that, all the commands print one output
1232 line per changed file.</p></div>
1236 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1237 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1238 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1239 create :000000 100644 0000000... 1234567... A file4
1240 delete :100644 000000 1234567... 0000000... D file5
1241 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1242 </div></div>
1245 <li>
1246 <p>
1247 a colon.
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 space.
1268 </p>
1269 </li>
1270 <li>
1271 <p>
1273 </p>
1274 </li>
1275 <li>
1276 <p>
1277 a space.
1278 </p>
1279 </li>
1280 <li>
1281 <p>
1283 </p>
1284 </li>
1285 <li>
1286 <p>
1287 a space.
1288 </p>
1289 </li>
1290 <li>
1291 <p>
1293 </p>
1294 </li>
1295 <li>
1296 <p>
1297 a tab or a NUL when <em>-z</em> option is used.
1298 </p>
1299 </li>
1300 <li>
1301 <p>
1303 </p>
1304 </li>
1305 <li>
1306 <p>
1307 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1308 </p>
1309 </li>
1310 <li>
1311 <p>
1313 </p>
1314 </li>
1315 <li>
1316 <p>
1317 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1318 </p>
1319 </li>
1320 </ol></div>
1323 <li>
1324 <p>
1325 A: addition of a file
1326 </p>
1327 </li>
1328 <li>
1329 <p>
1330 C: copy of a file into a new one
1331 </p>
1332 </li>
1333 <li>
1334 <p>
1335 D: deletion of a file
1336 </p>
1337 </li>
1338 <li>
1339 <p>
1340 M: modification of the contents or mode of a file
1341 </p>
1342 </li>
1343 <li>
1344 <p>
1345 R: renaming of a file
1346 </p>
1347 </li>
1348 <li>
1349 <p>
1350 T: change in the type of the file
1351 </p>
1352 </li>
1353 <li>
1354 <p>
1355 U: file is unmerged (you must complete the merge before it can
1356 be committed)
1357 </p>
1358 </li>
1359 <li>
1360 <p>
1362 </p>
1363 </li>
1364 </ul></div>
1366 percentage of similarity between the source and target of the move or
1367 copy), and are the only ones to be so.</p></div>
1368 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1369 and it is out of sync with the index.</p></div>
1373 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1374 </div></div>
1375 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1376 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1377 respectively.</p></div>
1378 </div>
1382 can take <em>-c</em> or <em>--cc</em> option
1383 to generate diff output also for merge commits. The output differs
1384 from the format described above in the following way:</p></div>
1386 <li>
1387 <p>
1388 there is a colon for each parent
1389 </p>
1390 </li>
1391 <li>
1392 <p>
1394 </p>
1395 </li>
1396 <li>
1397 <p>
1398 status is concatenated status characters for each parent
1399 </p>
1400 </li>
1401 <li>
1402 <p>
1404 </p>
1405 </li>
1406 <li>
1407 <p>
1409 </p>
1410 </li>
1411 </ol></div>
1415 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1416 </div></div>
1417 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1418 all parents.</p></div>
1419 </div>
1425 do not produce the output described above; instead they produce a
1426 patch file. You can customize the creation of such patches via the
1427 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1428 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1429 diff format:</p></div>
1431 <li>
1432 <p>
1434 </p>
1437 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1438 </div></div>
1439 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1440 involved. Especially, even for a creation or a deletion,
1441 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1442 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1443 name of the source file of the rename/copy and the name of
1444 the file that rename/copy produces, respectively.</p></div>
1445 </li>
1446 <li>
1447 <p>
1448 It is followed by one or more extended header lines:
1449 </p>
1452 <pre><tt>old mode <mode>
1453 new mode <mode>
1454 deleted file mode <mode>
1455 new file mode <mode>
1456 copy from <path>
1457 copy to <path>
1458 rename from <path>
1459 rename to <path>
1460 similarity index <number>
1461 dissimilarity index <number>
1462 index <hash>..<hash> <mode></tt></pre>
1463 </div></div>
1464 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1465 and file permission bits.</p></div>
1466 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1468 the dissimilarity index is the percentage of changed lines. It
1469 is a rounded down integer, followed by a percent sign. The
1470 similarity index value of 100% is thus reserved for two equal
1471 files, while 100% dissimilarity means that no line from the old
1472 file made it into the new one.</p></div>
1473 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1474 The <mode> is included if the file mode does not change; otherwise,
1475 separate lines indicate the old and the new mode.</p></div>
1476 </li>
1477 <li>
1478 <p>
1479 TAB, LF, double quote and backslash characters in pathnames
1481 If there is need for such substitution then the whole
1482 pathname is put in double quotes.
1483 </p>
1484 </li>
1485 <li>
1486 <p>
1489 It is incorrect to apply each change to each file sequentially. For
1490 example, this patch will swap a and b:
1491 </p>
1494 <pre><tt>diff --git a/a b/b
1495 rename from a
1496 rename to b
1497 diff --git a/b b/a
1498 rename from b
1499 rename to a</tt></pre>
1500 </div></div>
1501 </li>
1502 </ol></div>
1503 </div>
1506 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1509 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1510 of these commands to force generation of diffs with individual parents
1511 of a merge.</p></div>
1515 <pre><tt>diff --combined describe.c
1516 index fabadb8,cc95eb0..4866510
1517 --- a/describe.c
1518 +++ b/describe.c
1521 }
1523 - static void describe(char *arg)
1524 -static void describe(struct commit *cmit, int last_one)
1525 ++static void describe(char *arg, int last_one)
1526 {
1527 + unsigned char sha1[20];
1528 + struct commit *cmit;
1529 struct commit_list *list;
1530 static int initialized = 0;
1531 struct commit_name *n;
1534 + usage(describe_usage);
1535 + cmit = lookup_commit_reference(sha1);
1536 + if (!cmit)
1537 + usage(describe_usage);
1538 +
1539 if (!initialized) {
1540 initialized = 1;
1541 for_each_ref(get_name);</tt></pre>
1542 </div></div>
1544 <li>
1545 <p>
1546 It is preceded with a "git diff" header, that looks like
1548 </p>
1552 </div></div>
1557 </div></div>
1558 </li>
1559 <li>
1560 <p>
1561 It is followed by one or more extended header lines
1562 (this example shows a merge with two parents):
1563 </p>
1570 </div></div>
1571 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1573 information about detected contents movement (renames and
1574 copying detection) are designed to work with diff of two
1576 </li>
1577 <li>
1578 <p>
1579 It is followed by two-line from-file/to-file header
1580 </p>
1583 <pre><tt>--- a/file
1584 +++ b/file</tt></pre>
1585 </div></div>
1588 files.</p></div>
1589 </li>
1590 <li>
1591 <p>
1592 Chunk header format is modified to prevent people from
1594 was created for review of merge commit changes, and was not
1595 meant for apply. The change is similar to the change in the
1597 </p>
1600 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1601 </div></div>
1603 header for combined diff format.</p></div>
1604 </li>
1605 </ol></div>
1607 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
1609 compares two or more files file1, file2,… with one file X, and
1610 shows how X differs from each of fileN. One column for each of
1611 fileN is prepended to the output line to note how X’s line is
1612 different from it.</p></div>
1613 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1615 in the column N means that the line appears in the result,
1616 and fileN does not have that line (in other words, the line was
1617 added, from the point of view of that parent).</p></div>
1621 in either file1 nor file2). Also eight other lines are the same
1623 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1624 merge commit with the merge result (i.e. file1..fileN are the
1626 two unresolved merge parents with the working tree file
1629 </div>
1632 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1634 output. These options can be combined with other options, such as
1636 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1637 formats the pathnames compactly by combining common prefix and suffix of
1643 </div></div>
1644 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1646 like this:</p></div>
1651 </div></div>
1654 <li>
1655 <p>
1656 the number of added lines;
1657 </p>
1658 </li>
1659 <li>
1660 <p>
1661 a tab;
1662 </p>
1663 </li>
1664 <li>
1665 <p>
1666 the number of deleted lines;
1667 </p>
1668 </li>
1669 <li>
1670 <p>
1671 a tab;
1672 </p>
1673 </li>
1674 <li>
1675 <p>
1676 pathname (possibly with rename/copy information);
1677 </p>
1678 </li>
1679 <li>
1680 <p>
1681 a newline.
1682 </p>
1683 </li>
1684 </ol></div>
1685 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1690 </div></div>
1693 <li>
1694 <p>
1695 the number of added lines;
1696 </p>
1697 </li>
1698 <li>
1699 <p>
1700 a tab;
1701 </p>
1702 </li>
1703 <li>
1704 <p>
1705 the number of deleted lines;
1706 </p>
1707 </li>
1708 <li>
1709 <p>
1710 a tab;
1711 </p>
1712 </li>
1713 <li>
1714 <p>
1715 a NUL (only exists if renamed/copied);
1716 </p>
1717 </li>
1718 <li>
1719 <p>
1720 pathname in preimage;
1721 </p>
1722 </li>
1723 <li>
1724 <p>
1725 a NUL (only exists if renamed/copied);
1726 </p>
1727 </li>
1728 <li>
1729 <p>
1730 pathname in postimage (only exists if renamed/copied);
1731 </p>
1732 </li>
1733 <li>
1734 <p>
1735 a NUL.
1736 </p>
1737 </li>
1738 </ol></div>
1739 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1740 scripts that read the output to tell if the current record being read is
1741 a single-path record or a rename/copy record without reading ahead.
1744 </div>
1750 of these operations are very useful indeed.</p></div>
1751 </div>
1757 <pre><tt>show me the differences between HEAD and the current index
1758 contents (the ones I'd write using 'git write-tree')</tt></pre>
1759 </div></div>
1760 <div class="paragraph"><p>For example, let’s say that you have worked on your working directory, updated
1761 some files in the index and are ready to commit. You want to see exactly
1763 object and compare it that way, and to do that, you just do</p></div>
1767 </div></div>
1768 <div class="paragraph"><p>Example: let’s say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had
1777 </div></div>
1779 <div class="paragraph"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to
1781 nicer for the case where you just want to check where you are.</p></div>
1782 <div class="paragraph"><p>So doing a <tt>git diff-index --cached</tt> is basically very useful when you are
1783 asking yourself "what have I already marked for being committed, and
1785 </div>
1789 the more useful of the two in that what it does can’t be emulated with
1791 The non-cached version asks the question:</p></div>
1794 <pre><tt>show me the differences between HEAD and the currently checked out
1795 tree - index contents _and_ files that aren't up-to-date</tt></pre>
1796 </div></div>
1797 <div class="paragraph"><p>which is obviously a very useful question too, since that tells you what
1799 output to a tee, but with a twist.</p></div>
1800 <div class="paragraph"><p>The twist is that if some file doesn’t match the index, we don’t have
1801 a backing store thing for it, and we use the magic "all-zero" sha1 to
1809 </div></div>
1810 <div class="paragraph"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is
1811 not up-to-date and may contain new stuff. The all-zero sha1 means that to
1812 get the real diff, you need to look at the object in the working directory
1813 directly rather than do an object-to-object diff.</p></div>
1815 <table><tr>
1818 </td>
1820 actually look at the contents of the file at all. So maybe
1822 touched it. In either case, it’s a note that you need to
1824 </tr></table>
1825 </div>
1827 <table><tr>
1830 </td>
1832 and "is still dirty in the working directory" together. You can always
1833 tell which file is in which state, since the "has been updated" ones
1834 show a valid sha1, and the "not in sync with the index" ones will
1835 always have the special all-zero sha1.</td>
1836 </tr></table>
1837 </div>
1838 </div>
1842 </div>
1846 </div>
1847 </div>
1848 </body>
1849 </html>