| blob | 0c941c26552f2908ab0b83b0f293288852c5c2b3 |
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 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-diff-index(1) Manual Page
574 </h1>
577 <p>git-diff-index -
578 Compares content and mode of blobs between the index and repository
579 </p>
580 </div>
581 </div>
586 <div class="verseblock-content"><em>git diff-index</em> [-m] [--cached] [<common diff options>] <tree-ish> [<path>…]</div>
588 </div></div>
589 </div>
593 object with the content of the current index and, optionally
594 ignoring the stat state of the file on disk. When paths are
595 specified, compares only those named paths. Otherwise all
596 entries in the index are compared.</p></div>
597 </div>
602 -p
603 </dt>
605 -u
606 </dt>
608 --patch
609 </dt>
610 <dd>
611 <p>
612 Generate patch (see section on generating patches).
614 </p>
615 </dd>
618 </dt>
621 </dt>
622 <dd>
623 <p>
625 the usual three.
627 </p>
628 </dd>
630 --raw
631 </dt>
632 <dd>
633 <p>
634 Generate the raw format.
635 This is the default.
636 </p>
637 </dd>
639 --patch-with-raw
640 </dt>
641 <dd>
642 <p>
644 </p>
645 </dd>
647 --minimal
648 </dt>
649 <dd>
650 <p>
651 Spend extra time to make sure the smallest possible
652 diff is produced.
653 </p>
654 </dd>
656 --patience
657 </dt>
658 <dd>
659 <p>
660 Generate a diff using the "patience diff" algorithm.
661 </p>
662 </dd>
665 </dt>
666 <dd>
667 <p>
668 Generate a diffstat. You can override the default
670 The width of the filename part can be controlled by
671 giving another width to it separated by a comma.
675 </p>
676 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
677 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
678 </dd>
680 --numstat
681 </dt>
682 <dd>
683 <p>
685 deleted lines in decimal notation and pathname without
686 abbreviation, to make it more machine friendly. For
689 </p>
690 </dd>
692 --shortstat
693 </dt>
694 <dd>
695 <p>
697 number of modified files, as well as number of added and deleted
698 lines.
699 </p>
700 </dd>
703 </dt>
704 <dd>
705 <p>
706 Output the distribution of relative amount of changes for each
708 passing it a comma separated list of parameters.
711 The following parameters are available:
712 </p>
716 </dt>
717 <dd>
718 <p>
719 Compute the dirstat numbers by counting the lines that have been
720 removed from the source, or added to the destination. This ignores
721 the amount of pure code movements within a file. In other words,
722 rearranging lines in a file is not counted as much as other changes.
723 This is the default behavior when no parameter is given.
724 </p>
725 </dd>
728 </dt>
729 <dd>
730 <p>
731 Compute the dirstat numbers by doing the regular line-based diff
732 analysis, and summing the removed/added line counts. (For binary
733 files, count 64-byte chunks instead, since binary files have no
736 lines within a file as much as other changes. The resulting output
738 </p>
739 </dd>
742 </dt>
743 <dd>
744 <p>
745 Compute the dirstat numbers by counting the number of files changed.
746 Each changed file counts equally in the dirstat analysis. This is
748 not have to look at the file contents at all.
749 </p>
750 </dd>
753 </dt>
754 <dd>
755 <p>
756 Count changes in a child directory for the parent directory as well.
758 reported may exceed 100%. The default (non-cumulative) behavior can
760 </p>
761 </dd>
764 </dt>
765 <dd>
766 <p>
767 An integer parameter specifies a cut-off percent (3% by default).
768 Directories contributing less than this percentage of the changes
769 are not shown in the output.
770 </p>
771 </dd>
772 </dl></div>
774 directories with less than 10% of the total amount of changed files,
775 and accumulating child directory counts in the parent directories:
777 </dd>
779 --summary
780 </dt>
781 <dd>
782 <p>
783 Output a condensed summary of extended header information
784 such as creations, renames and mode changes.
785 </p>
786 </dd>
788 --patch-with-stat
789 </dt>
790 <dd>
791 <p>
793 </p>
794 </dd>
796 -z
797 </dt>
798 <dd>
799 <p>
800 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
801 given, do not munge pathnames and use NULs as output field terminators.
802 </p>
803 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
805 respectively, and the pathname will be enclosed in double quotes if
806 any of those replacements occurred.</p></div>
807 </dd>
809 --name-only
810 </dt>
811 <dd>
812 <p>
813 Show only names of changed files.
814 </p>
815 </dd>
817 --name-status
818 </dt>
819 <dd>
820 <p>
821 Show only names and status of changed files. See the description
822 of the <tt>--diff-filter</tt> option on what the status letters mean.
823 </p>
824 </dd>
826 --submodule[=<format>]
827 </dt>
828 <dd>
829 <p>
830 Chose the output format for submodule differences. <format> can be one of
831 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
832 is used when this option is not given. <em>log</em> is the default value for this
833 option and lists the commits in that commit range like the <em>summary</em>
835 </p>
836 </dd>
838 --color[=<when>]
839 </dt>
840 <dd>
841 <p>
842 Show colored diff.
843 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
844 The default value is <tt>never</tt>.
845 </p>
846 </dd>
848 --no-color
849 </dt>
850 <dd>
851 <p>
852 Turn off colored diff.
853 It is the same as <tt>--color=never</tt>.
854 </p>
855 </dd>
857 --word-diff[=<mode>]
858 </dt>
859 <dd>
860 <p>
861 Show a word diff, using the <mode> to delimit changed words.
862 By default, words are delimited by whitespace; see
863 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
864 must be one of:
865 </p>
868 color
869 </dt>
870 <dd>
871 <p>
872 Highlight changed words using only colors. Implies <tt>--color</tt>.
873 </p>
874 </dd>
876 plain
877 </dt>
878 <dd>
879 <p>
880 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
881 attempts to escape the delimiters if they appear in the input,
882 so the output may be ambiguous.
883 </p>
884 </dd>
886 porcelain
887 </dt>
888 <dd>
889 <p>
890 Use a special line-based format intended for script
891 consumption. Added/removed/unchanged runs are printed in the
892 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
893 character at the beginning of the line and extending to the
894 end of the line. Newlines in the input are represented by a
895 tilde <tt>~</tt> on a line of its own.
896 </p>
897 </dd>
899 none
900 </dt>
901 <dd>
902 <p>
903 Disable word diff again.
904 </p>
905 </dd>
906 </dl></div>
908 highlight the changed parts in all modes if enabled.</p></div>
909 </dd>
911 --word-diff-regex=<regex>
912 </dt>
913 <dd>
914 <p>
915 Use <regex> to decide what a word is, instead of considering
916 runs of non-whitespace to be a word. Also implies
917 <tt>--word-diff</tt> unless it was already enabled.
918 </p>
920 <regex> is considered a word. Anything between these matches is
921 considered whitespace and ignored(!) for the purposes of finding
922 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
923 expression to make sure that it matches all non-whitespace characters.
924 A match that contains a newline is silently truncated(!) at the
925 newline.</p></div>
926 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
927 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
928 overrides any diff driver or configuration setting. Diff drivers
929 override configuration settings.</p></div>
930 </dd>
932 --color-words[=<regex>]
933 </dt>
934 <dd>
935 <p>
936 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
937 specified) <tt>--word-diff-regex=<regex></tt>.
938 </p>
939 </dd>
941 --no-renames
942 </dt>
943 <dd>
944 <p>
945 Turn off rename detection, even when the configuration
946 file gives the default to do so.
947 </p>
948 </dd>
950 --check
951 </dt>
952 <dd>
953 <p>
954 Warn if changes introduce whitespace errors. What are
955 considered whitespace errors is controlled by <tt>core.whitespace</tt>
956 configuration. By default, trailing whitespaces (including
957 lines that solely consist of whitespaces) and a space character
958 that is immediately followed by a tab character inside the
959 initial indent of the line are considered whitespace errors.
960 Exits with non-zero status if problems are found. Not compatible
961 with --exit-code.
962 </p>
963 </dd>
965 --full-index
966 </dt>
967 <dd>
968 <p>
969 Instead of the first handful of characters, show the full
971 line when generating patch format output.
972 </p>
973 </dd>
975 --binary
976 </dt>
977 <dd>
978 <p>
979 In addition to <tt>--full-index</tt>, output a binary diff that
980 can be applied with <tt>git-apply</tt>.
981 </p>
982 </dd>
984 --abbrev[=<n>]
985 </dt>
986 <dd>
987 <p>
988 Instead of showing the full 40-byte hexadecimal object
989 name in diff-raw format output and diff-tree header
990 lines, show only a partial prefix. This is
991 independent of the <tt>--full-index</tt> option above, which controls
992 the diff-patch output format. Non default number of
993 digits can be specified with <tt>--abbrev=<n></tt>.
994 </p>
995 </dd>
997 -B[<n>][/<m>]
998 </dt>
1000 --break-rewrites[=[<n>][/<m>]]
1001 </dt>
1002 <dd>
1003 <p>
1004 Break complete rewrite changes into pairs of delete and
1005 create. This serves two purposes:
1006 </p>
1007 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1008 not as a series of deletion and insertion mixed together with a very
1009 few lines that happen to match textually as the context, but as a
1010 single deletion of everything old followed by a single insertion of
1011 everything new, and the number <tt>m</tt> controls this aspect of the -B
1012 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
1013 original should remain in the result for git to consider it a total
1014 rewrite (i.e. otherwise the resulting patch will be a series of
1015 deletion and insertion mixed together with context lines).</p></div>
1016 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1017 source of a rename (usually -M only considers a file that disappeared
1018 as the source of a rename), and the number <tt>n</tt> controls this aspect of
1019 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
1020 addition and deletion compared to 20% or more of the file’s size are
1021 eligible for being picked up as a possible source of a rename to
1022 another file.</p></div>
1023 </dd>
1025 -M[<n>]
1026 </dt>
1028 --find-renames[=<n>]
1029 </dt>
1030 <dd>
1031 <p>
1032 Detect renames.
1033 If <tt>n</tt> is specified, it is a threshold on the similarity
1034 index (i.e. amount of addition/deletions compared to the
1035 file’s size). For example, <tt>-M90%</tt> means git should consider a
1036 delete/add pair to be a rename if more than 90% of the file
1037 hasn’t changed.
1038 </p>
1039 </dd>
1041 -C[<n>]
1042 </dt>
1044 --find-copies[=<n>]
1045 </dt>
1046 <dd>
1047 <p>
1048 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
1049 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
1050 </p>
1051 </dd>
1053 --find-copies-harder
1054 </dt>
1055 <dd>
1056 <p>
1057 For performance reasons, by default, <tt>-C</tt> option finds copies only
1058 if the original file of the copy was modified in the same
1059 changeset. This flag makes the command
1060 inspect unmodified files as candidates for the source of
1061 copy. This is a very expensive operation for large
1062 projects, so use it with caution. Giving more than one
1063 <tt>-C</tt> option has the same effect.
1064 </p>
1065 </dd>
1067 -D
1068 </dt>
1070 --irreversible-delete
1071 </dt>
1072 <dd>
1073 <p>
1074 Omit the preimage for deletes, i.e. print only the header but not
1075 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
1076 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
1077 solely for people who want to just concentrate on reviewing the
1078 text after the change. In addition, the output obviously lack
1079 enough information to apply such a patch in reverse, even manually,
1080 hence the name of the option.
1081 </p>
1082 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
1083 of a delete/create pair.</p></div>
1084 </dd>
1086 -l<num>
1087 </dt>
1088 <dd>
1089 <p>
1090 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
1091 is the number of potential rename/copy targets. This
1092 option prevents rename/copy detection from running if
1093 the number of rename/copy targets exceeds the specified
1094 number.
1095 </p>
1096 </dd>
1098 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1099 </dt>
1100 <dd>
1101 <p>
1102 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
1103 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
1104 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
1105 are Unmerged (<tt>U</tt>), are
1106 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
1107 Any combination of the filter characters (including none) can be used.
1108 When <tt>*</tt> (All-or-none) is added to the combination, all
1109 paths are selected if there is any file that matches
1110 other criteria in the comparison; if there is no file
1111 that matches other criteria, nothing is selected.
1112 </p>
1113 </dd>
1115 -S<string>
1116 </dt>
1117 <dd>
1118 <p>
1119 Look for differences that introduce or remove an instance of
1120 <string>. Note that this is different than the string simply
1121 appearing in diff output; see the <em>pickaxe</em> entry in
1123 </p>
1124 </dd>
1126 -G<regex>
1127 </dt>
1128 <dd>
1129 <p>
1130 Look for differences whose added or removed line matches
1131 the given <regex>.
1132 </p>
1133 </dd>
1135 --pickaxe-all
1136 </dt>
1137 <dd>
1138 <p>
1139 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
1140 changeset, not just the files that contain the change
1141 in <string>.
1142 </p>
1143 </dd>
1145 --pickaxe-regex
1146 </dt>
1147 <dd>
1148 <p>
1149 Make the <string> not a plain string but an extended POSIX
1150 regex to match.
1151 </p>
1152 </dd>
1154 -O<orderfile>
1155 </dt>
1156 <dd>
1157 <p>
1158 Output the patch in the order specified in the
1159 <orderfile>, which has one shell glob pattern per line.
1160 </p>
1161 </dd>
1163 -R
1164 </dt>
1165 <dd>
1166 <p>
1167 Swap two inputs; that is, show differences from index or
1168 on-disk file to tree contents.
1169 </p>
1170 </dd>
1172 --relative[=<path>]
1173 </dt>
1174 <dd>
1175 <p>
1176 When run from a subdirectory of the project, it can be
1177 told to exclude changes outside the directory and show
1178 pathnames relative to it with this option. When you are
1179 not in a subdirectory (e.g. in a bare repository), you
1180 can name which subdirectory to make the output relative
1181 to by giving a <path> as an argument.
1182 </p>
1183 </dd>
1185 -a
1186 </dt>
1188 --text
1189 </dt>
1190 <dd>
1191 <p>
1192 Treat all files as text.
1193 </p>
1194 </dd>
1196 --ignore-space-at-eol
1197 </dt>
1198 <dd>
1199 <p>
1200 Ignore changes in whitespace at EOL.
1201 </p>
1202 </dd>
1204 -b
1205 </dt>
1207 --ignore-space-change
1208 </dt>
1209 <dd>
1210 <p>
1211 Ignore changes in amount of whitespace. This ignores whitespace
1212 at line end, and considers all other sequences of one or
1213 more whitespace characters to be equivalent.
1214 </p>
1215 </dd>
1217 -w
1218 </dt>
1220 --ignore-all-space
1221 </dt>
1222 <dd>
1223 <p>
1224 Ignore whitespace when comparing lines. This ignores
1225 differences even if one line has whitespace where the other
1226 line has none.
1227 </p>
1228 </dd>
1230 --inter-hunk-context=<lines>
1231 </dt>
1232 <dd>
1233 <p>
1234 Show the context between diff hunks, up to the specified number
1235 of lines, thereby fusing hunks that are close to each other.
1236 </p>
1237 </dd>
1239 --exit-code
1240 </dt>
1241 <dd>
1242 <p>
1243 Make the program exit with codes similar to diff(1).
1244 That is, it exits with 1 if there were differences and
1245 0 means no differences.
1246 </p>
1247 </dd>
1249 --quiet
1250 </dt>
1251 <dd>
1252 <p>
1253 Disable all output of the program. Implies <tt>--exit-code</tt>.
1254 </p>
1255 </dd>
1257 --ext-diff
1258 </dt>
1259 <dd>
1260 <p>
1261 Allow an external diff helper to be executed. If you set an
1264 </p>
1265 </dd>
1267 --no-ext-diff
1268 </dt>
1269 <dd>
1270 <p>
1271 Disallow external diff drivers.
1272 </p>
1273 </dd>
1275 --textconv
1276 </dt>
1278 --no-textconv
1279 </dt>
1280 <dd>
1281 <p>
1282 Allow (or disallow) external text conversion filters to be run
1284 details. Because textconv filters are typically a one-way
1285 conversion, the resulting diff is suitable for human
1286 consumption, but cannot be applied. For this reason, textconv
1288 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1289 diff plumbing commands.
1290 </p>
1291 </dd>
1293 --ignore-submodules[=<when>]
1294 </dt>
1295 <dd>
1296 <p>
1297 Ignore changes to submodules in the diff generation. <when> can be
1300 untracked or modified files or its HEAD differs from the commit recorded
1301 in the superproject and can be used to override any settings of the
1302 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1304 contain untracked content (but they are still scanned for modified
1306 only changes to the commits stored in the superproject are shown (this was
1308 </p>
1309 </dd>
1311 --src-prefix=<prefix>
1312 </dt>
1313 <dd>
1314 <p>
1316 </p>
1317 </dd>
1319 --dst-prefix=<prefix>
1320 </dt>
1321 <dd>
1322 <p>
1324 </p>
1325 </dd>
1327 --no-prefix
1328 </dt>
1329 <dd>
1330 <p>
1331 Do not show any source or destination prefix.
1332 </p>
1333 </dd>
1334 </dl></div>
1339 <tree-ish>
1340 </dt>
1341 <dd>
1342 <p>
1343 The id of a tree object to diff against.
1344 </p>
1345 </dd>
1347 --cached
1348 </dt>
1349 <dd>
1350 <p>
1351 do not consider the on-disk file at all
1352 </p>
1353 </dd>
1355 -m
1356 </dt>
1357 <dd>
1358 <p>
1359 By default, files recorded in the index but not checked
1360 out are reported as deleted. This flag makes
1361 <em>git diff-index</em> say that all non-checked-out files are up
1362 to date.
1363 </p>
1364 </dd>
1365 </dl></div>
1366 </div>
1372 compared differs:</p></div>
1375 git-diff-index <tree-ish>
1376 </dt>
1377 <dd>
1378 <p>
1379 compares the <tree-ish> and the files on the filesystem.
1380 </p>
1381 </dd>
1383 git-diff-index --cached <tree-ish>
1384 </dt>
1385 <dd>
1386 <p>
1387 compares the <tree-ish> and the index.
1388 </p>
1389 </dd>
1391 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1392 </dt>
1393 <dd>
1394 <p>
1395 compares the trees named by the two arguments.
1396 </p>
1397 </dd>
1399 git-diff-files [<pattern>…]
1400 </dt>
1401 <dd>
1402 <p>
1403 compares the index and the files on the filesystem.
1404 </p>
1405 </dd>
1406 </dl></div>
1407 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1408 what is being compared. After that, all the commands print one output
1409 line per changed file.</p></div>
1413 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1414 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1415 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1416 create :000000 100644 0000000... 1234567... A file4
1417 delete :100644 000000 1234567... 0000000... D file5
1418 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1419 </div></div>
1422 <li>
1423 <p>
1424 a colon.
1425 </p>
1426 </li>
1427 <li>
1428 <p>
1430 </p>
1431 </li>
1432 <li>
1433 <p>
1434 a space.
1435 </p>
1436 </li>
1437 <li>
1438 <p>
1440 </p>
1441 </li>
1442 <li>
1443 <p>
1444 a space.
1445 </p>
1446 </li>
1447 <li>
1448 <p>
1450 </p>
1451 </li>
1452 <li>
1453 <p>
1454 a space.
1455 </p>
1456 </li>
1457 <li>
1458 <p>
1460 </p>
1461 </li>
1462 <li>
1463 <p>
1464 a space.
1465 </p>
1466 </li>
1467 <li>
1468 <p>
1470 </p>
1471 </li>
1472 <li>
1473 <p>
1474 a tab or a NUL when <em>-z</em> option is used.
1475 </p>
1476 </li>
1477 <li>
1478 <p>
1480 </p>
1481 </li>
1482 <li>
1483 <p>
1484 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1485 </p>
1486 </li>
1487 <li>
1488 <p>
1490 </p>
1491 </li>
1492 <li>
1493 <p>
1494 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1495 </p>
1496 </li>
1497 </ol></div>
1500 <li>
1501 <p>
1502 A: addition of a file
1503 </p>
1504 </li>
1505 <li>
1506 <p>
1507 C: copy of a file into a new one
1508 </p>
1509 </li>
1510 <li>
1511 <p>
1512 D: deletion of a file
1513 </p>
1514 </li>
1515 <li>
1516 <p>
1517 M: modification of the contents or mode of a file
1518 </p>
1519 </li>
1520 <li>
1521 <p>
1522 R: renaming of a file
1523 </p>
1524 </li>
1525 <li>
1526 <p>
1527 T: change in the type of the file
1528 </p>
1529 </li>
1530 <li>
1531 <p>
1532 U: file is unmerged (you must complete the merge before it can
1533 be committed)
1534 </p>
1535 </li>
1536 <li>
1537 <p>
1539 </p>
1540 </li>
1541 </ul></div>
1543 percentage of similarity between the source and target of the move or
1544 copy), and are the only ones to be so.</p></div>
1545 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1546 and it is out of sync with the index.</p></div>
1550 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1551 </div></div>
1552 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1553 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1554 respectively.</p></div>
1555 </div>
1559 can take <em>-c</em> or <em>--cc</em> option
1560 to generate diff output also for merge commits. The output differs
1561 from the format described above in the following way:</p></div>
1563 <li>
1564 <p>
1565 there is a colon for each parent
1566 </p>
1567 </li>
1568 <li>
1569 <p>
1571 </p>
1572 </li>
1573 <li>
1574 <p>
1575 status is concatenated status characters for each parent
1576 </p>
1577 </li>
1578 <li>
1579 <p>
1581 </p>
1582 </li>
1583 <li>
1584 <p>
1586 </p>
1587 </li>
1588 </ol></div>
1592 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1593 </div></div>
1594 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1595 all parents.</p></div>
1596 </div>
1602 do not produce the output described above; instead they produce a
1603 patch file. You can customize the creation of such patches via the
1604 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1605 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1606 diff format:</p></div>
1608 <li>
1609 <p>
1611 </p>
1614 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1615 </div></div>
1616 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1617 involved. Especially, even for a creation or a deletion,
1618 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1619 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1620 name of the source file of the rename/copy and the name of
1621 the file that rename/copy produces, respectively.</p></div>
1622 </li>
1623 <li>
1624 <p>
1625 It is followed by one or more extended header lines:
1626 </p>
1629 <pre><tt>old mode <mode>
1630 new mode <mode>
1631 deleted file mode <mode>
1632 new file mode <mode>
1633 copy from <path>
1634 copy to <path>
1635 rename from <path>
1636 rename to <path>
1637 similarity index <number>
1638 dissimilarity index <number>
1639 index <hash>..<hash> <mode></tt></pre>
1640 </div></div>
1641 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1642 and file permission bits.</p></div>
1643 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1645 the dissimilarity index is the percentage of changed lines. It
1646 is a rounded down integer, followed by a percent sign. The
1647 similarity index value of 100% is thus reserved for two equal
1648 files, while 100% dissimilarity means that no line from the old
1649 file made it into the new one.</p></div>
1650 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1651 The <mode> is included if the file mode does not change; otherwise,
1652 separate lines indicate the old and the new mode.</p></div>
1653 </li>
1654 <li>
1655 <p>
1656 TAB, LF, double quote and backslash characters in pathnames
1658 If there is need for such substitution then the whole
1659 pathname is put in double quotes.
1660 </p>
1661 </li>
1662 <li>
1663 <p>
1666 It is incorrect to apply each change to each file sequentially. For
1667 example, this patch will swap a and b:
1668 </p>
1671 <pre><tt>diff --git a/a b/b
1672 rename from a
1673 rename to b
1674 diff --git a/b b/a
1675 rename from b
1676 rename to a</tt></pre>
1677 </div></div>
1678 </li>
1679 </ol></div>
1680 </div>
1683 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1686 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1687 of these commands to force generation of diffs with individual parents
1688 of a merge.</p></div>
1692 <pre><tt>diff --combined describe.c
1693 index fabadb8,cc95eb0..4866510
1694 --- a/describe.c
1695 +++ b/describe.c
1698 }
1700 - static void describe(char *arg)
1701 -static void describe(struct commit *cmit, int last_one)
1702 ++static void describe(char *arg, int last_one)
1703 {
1704 + unsigned char sha1[20];
1705 + struct commit *cmit;
1706 struct commit_list *list;
1707 static int initialized = 0;
1708 struct commit_name *n;
1711 + usage(describe_usage);
1712 + cmit = lookup_commit_reference(sha1);
1713 + if (!cmit)
1714 + usage(describe_usage);
1715 +
1716 if (!initialized) {
1717 initialized = 1;
1718 for_each_ref(get_name);</tt></pre>
1719 </div></div>
1721 <li>
1722 <p>
1723 It is preceded with a "git diff" header, that looks like
1725 </p>
1729 </div></div>
1734 </div></div>
1735 </li>
1736 <li>
1737 <p>
1738 It is followed by one or more extended header lines
1739 (this example shows a merge with two parents):
1740 </p>
1747 </div></div>
1748 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1750 information about detected contents movement (renames and
1751 copying detection) are designed to work with diff of two
1753 </li>
1754 <li>
1755 <p>
1756 It is followed by two-line from-file/to-file header
1757 </p>
1760 <pre><tt>--- a/file
1761 +++ b/file</tt></pre>
1762 </div></div>
1765 files.</p></div>
1766 </li>
1767 <li>
1768 <p>
1769 Chunk header format is modified to prevent people from
1771 was created for review of merge commit changes, and was not
1772 meant for apply. The change is similar to the change in the
1774 </p>
1777 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1778 </div></div>
1780 header for combined diff format.</p></div>
1781 </li>
1782 </ol></div>
1784 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
1786 compares two or more files file1, file2,… with one file X, and
1787 shows how X differs from each of fileN. One column for each of
1788 fileN is prepended to the output line to note how X’s line is
1789 different from it.</p></div>
1790 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1792 in the column N means that the line appears in the result,
1793 and fileN does not have that line (in other words, the line was
1794 added, from the point of view of that parent).</p></div>
1798 in either file1 nor file2). Also eight other lines are the same
1800 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1801 merge commit with the merge result (i.e. file1..fileN are the
1803 two unresolved merge parents with the working tree file
1806 </div>
1809 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1811 output. These options can be combined with other options, such as
1813 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1814 formats the pathnames compactly by combining common prefix and suffix of
1820 </div></div>
1821 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1823 like this:</p></div>
1828 </div></div>
1831 <li>
1832 <p>
1833 the number of added lines;
1834 </p>
1835 </li>
1836 <li>
1837 <p>
1838 a tab;
1839 </p>
1840 </li>
1841 <li>
1842 <p>
1843 the number of deleted lines;
1844 </p>
1845 </li>
1846 <li>
1847 <p>
1848 a tab;
1849 </p>
1850 </li>
1851 <li>
1852 <p>
1853 pathname (possibly with rename/copy information);
1854 </p>
1855 </li>
1856 <li>
1857 <p>
1858 a newline.
1859 </p>
1860 </li>
1861 </ol></div>
1862 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1867 </div></div>
1870 <li>
1871 <p>
1872 the number of added lines;
1873 </p>
1874 </li>
1875 <li>
1876 <p>
1877 a tab;
1878 </p>
1879 </li>
1880 <li>
1881 <p>
1882 the number of deleted lines;
1883 </p>
1884 </li>
1885 <li>
1886 <p>
1887 a tab;
1888 </p>
1889 </li>
1890 <li>
1891 <p>
1892 a NUL (only exists if renamed/copied);
1893 </p>
1894 </li>
1895 <li>
1896 <p>
1897 pathname in preimage;
1898 </p>
1899 </li>
1900 <li>
1901 <p>
1902 a NUL (only exists if renamed/copied);
1903 </p>
1904 </li>
1905 <li>
1906 <p>
1907 pathname in postimage (only exists if renamed/copied);
1908 </p>
1909 </li>
1910 <li>
1911 <p>
1912 a NUL.
1913 </p>
1914 </li>
1915 </ol></div>
1916 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1917 scripts that read the output to tell if the current record being read is
1918 a single-path record or a rename/copy record without reading ahead.
1921 </div>
1927 of these operations are very useful indeed.</p></div>
1928 </div>
1934 <pre><tt>show me the differences between HEAD and the current index
1935 contents (the ones I'd write using 'git write-tree')</tt></pre>
1936 </div></div>
1937 <div class="paragraph"><p>For example, let’s say that you have worked on your working directory, updated
1938 some files in the index and are ready to commit. You want to see exactly
1940 object and compare it that way, and to do that, you just do</p></div>
1944 </div></div>
1945 <div class="paragraph"><p>Example: let’s say I had renamed <tt>commit.c</tt> to <tt>git-commit.c</tt>, and I had
1954 </div></div>
1956 <div class="paragraph"><p>In fact, <tt>git diff-index --cached</tt> <strong>should</strong> always be entirely equivalent to
1958 nicer for the case where you just want to check where you are.</p></div>
1959 <div class="paragraph"><p>So doing a <tt>git diff-index --cached</tt> is basically very useful when you are
1960 asking yourself "what have I already marked for being committed, and
1962 </div>
1966 the more useful of the two in that what it does can’t be emulated with
1968 The non-cached version asks the question:</p></div>
1971 <pre><tt>show me the differences between HEAD and the currently checked out
1972 tree - index contents _and_ files that aren't up-to-date</tt></pre>
1973 </div></div>
1974 <div class="paragraph"><p>which is obviously a very useful question too, since that tells you what
1976 output to a tee, but with a twist.</p></div>
1977 <div class="paragraph"><p>The twist is that if some file doesn’t match the index, we don’t have
1978 a backing store thing for it, and we use the magic "all-zero" sha1 to
1986 </div></div>
1987 <div class="paragraph"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is
1988 not up-to-date and may contain new stuff. The all-zero sha1 means that to
1989 get the real diff, you need to look at the object in the working directory
1990 directly rather than do an object-to-object diff.</p></div>
1992 <table><tr>
1995 </td>
1997 actually look at the contents of the file at all. So maybe
1999 touched it. In either case, it’s a note that you need to
2001 </tr></table>
2002 </div>
2004 <table><tr>
2007 </td>
2009 and "is still dirty in the working directory" together. You can always
2010 tell which file is in which state, since the "has been updated" ones
2011 show a valid sha1, and the "not in sync with the index" ones will
2012 always have the special all-zero sha1.</td>
2013 </tr></table>
2014 </div>
2015 </div>
2019 </div>
2020 </div>
2025 </div>
2026 </div>
2027 </body>
2028 </html>