| blob | fbb1161ff442539946e1fbeeab10c9436cec3850 |
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(1) Manual Page
574 </h1>
577 <p>git-diff -
578 Show changes between commits, commit and working tree, etc
579 </p>
580 </div>
581 </div>
586 <div class="verseblock-content"><em>git diff</em> [options] [<commit>] [--] [<path>…]
591 </div></div>
592 </div>
595 <div class="paragraph"><p>Show changes between the working tree and the index or a tree, changes
596 between the index and a tree, changes between two trees, or changes
597 between two files on disk.</p></div>
601 </dt>
602 <dd>
603 <p>
604 This form is to view the changes you made relative to
605 the index (staging area for the next commit). In other
607 further add to the index but you still haven’t. You can
609 </p>
612 directories. This behavior can be forced by --no-index.</p></div>
613 </dd>
616 </dt>
617 <dd>
618 <p>
619 This form is to view the changes you staged for the next
621 would want comparison with the latest commit, so if you
623 If HEAD does not exist (e.g. unborned branches) and
625 --staged is a synonym of --cached.
626 </p>
627 </dd>
630 </dt>
631 <dd>
632 <p>
633 This form is to view the changes you have in your
635 use HEAD to compare it with the latest commit, or a
636 branch name to compare with the tip of a different
637 branch.
638 </p>
639 </dd>
642 </dt>
643 <dd>
644 <p>
645 This is to view the changes between two arbitrary
647 </p>
648 </dd>
651 </dt>
652 <dd>
653 <p>
655 one side is omitted, it will have the same effect as
656 using HEAD instead.
657 </p>
658 </dd>
661 </dt>
662 <dd>
663 <p>
664 This form is to view the changes on the branch containing
667 "git diff $(git-merge-base A B) B". You can omit any one
669 </p>
670 </dd>
671 </dl></div>
674 in the last two forms that use ".." notations, can be any
680 and the range notations ("<commit>..<commit>" and
681 "<commit>...<commit>") do not mean a range as defined in the
683 </div>
688 -p
689 </dt>
691 -u
692 </dt>
694 --patch
695 </dt>
696 <dd>
697 <p>
698 Generate patch (see section on generating patches).
699 This is the default.
700 </p>
701 </dd>
704 </dt>
707 </dt>
708 <dd>
709 <p>
711 the usual three.
713 </p>
714 </dd>
716 --raw
717 </dt>
718 <dd>
719 <p>
720 Generate the raw format.
722 </p>
723 </dd>
725 --patch-with-raw
726 </dt>
727 <dd>
728 <p>
730 </p>
731 </dd>
733 --patience
734 </dt>
735 <dd>
736 <p>
737 Generate a diff using the "patience diff" algorithm.
738 </p>
739 </dd>
742 </dt>
743 <dd>
744 <p>
745 Generate a diffstat. You can override the default
747 The width of the filename part can be controlled by
748 giving another width to it separated by a comma.
752 </p>
753 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
754 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
755 </dd>
757 --numstat
758 </dt>
759 <dd>
760 <p>
762 deleted lines in decimal notation and pathname without
763 abbreviation, to make it more machine friendly. For
766 </p>
767 </dd>
769 --shortstat
770 </dt>
771 <dd>
772 <p>
774 number of modified files, as well as number of added and deleted
775 lines.
776 </p>
777 </dd>
780 </dt>
781 <dd>
782 <p>
783 Output the distribution of relative amount of changes for each
785 passing it a comma separated list of parameters.
788 The following parameters are available:
789 </p>
793 </dt>
794 <dd>
795 <p>
796 Compute the dirstat numbers by counting the lines that have been
797 removed from the source, or added to the destination. This ignores
798 the amount of pure code movements within a file. In other words,
799 rearranging lines in a file is not counted as much as other changes.
800 This is the default behavior when no parameter is given.
801 </p>
802 </dd>
805 </dt>
806 <dd>
807 <p>
808 Compute the dirstat numbers by doing the regular line-based diff
809 analysis, and summing the removed/added line counts. (For binary
810 files, count 64-byte chunks instead, since binary files have no
813 lines within a file as much as other changes. The resulting output
815 </p>
816 </dd>
819 </dt>
820 <dd>
821 <p>
822 Compute the dirstat numbers by counting the number of files changed.
823 Each changed file counts equally in the dirstat analysis. This is
825 not have to look at the file contents at all.
826 </p>
827 </dd>
830 </dt>
831 <dd>
832 <p>
833 Count changes in a child directory for the parent directory as well.
835 reported may exceed 100%. The default (non-cumulative) behavior can
837 </p>
838 </dd>
841 </dt>
842 <dd>
843 <p>
844 An integer parameter specifies a cut-off percent (3% by default).
845 Directories contributing less than this percentage of the changes
846 are not shown in the output.
847 </p>
848 </dd>
849 </dl></div>
851 directories with less than 10% of the total amount of changed files,
852 and accumulating child directory counts in the parent directories:
854 </dd>
856 --summary
857 </dt>
858 <dd>
859 <p>
860 Output a condensed summary of extended header information
861 such as creations, renames and mode changes.
862 </p>
863 </dd>
865 --patch-with-stat
866 </dt>
867 <dd>
868 <p>
870 </p>
871 </dd>
873 -z
874 </dt>
875 <dd>
876 <p>
877 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
878 given, do not munge pathnames and use NULs as output field terminators.
879 </p>
880 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
882 respectively, and the pathname will be enclosed in double quotes if
883 any of those replacements occurred.</p></div>
884 </dd>
886 --name-only
887 </dt>
888 <dd>
889 <p>
890 Show only names of changed files.
891 </p>
892 </dd>
894 --name-status
895 </dt>
896 <dd>
897 <p>
898 Show only names and status of changed files. See the description
899 of the <tt>--diff-filter</tt> option on what the status letters mean.
900 </p>
901 </dd>
903 --submodule[=<format>]
904 </dt>
905 <dd>
906 <p>
907 Chose the output format for submodule differences. <format> can be one of
908 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
909 is used when this option is not given. <em>log</em> is the default value for this
910 option and lists the commits in that commit range like the <em>summary</em>
912 </p>
913 </dd>
915 --color[=<when>]
916 </dt>
917 <dd>
918 <p>
919 Show colored diff.
920 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
921 The default value is <tt>never</tt>.
922 It can be changed by the <tt>color.ui</tt> and <tt>color.diff</tt>
923 configuration settings.
924 </p>
925 </dd>
927 --no-color
928 </dt>
929 <dd>
930 <p>
931 Turn off colored diff.
932 This can be used to override configuration settings.
933 It is the same as <tt>--color=never</tt>.
934 </p>
935 </dd>
937 --word-diff[=<mode>]
938 </dt>
939 <dd>
940 <p>
941 Show a word diff, using the <mode> to delimit changed words.
942 By default, words are delimited by whitespace; see
943 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
944 must be one of:
945 </p>
948 color
949 </dt>
950 <dd>
951 <p>
952 Highlight changed words using only colors. Implies <tt>--color</tt>.
953 </p>
954 </dd>
956 plain
957 </dt>
958 <dd>
959 <p>
960 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
961 attempts to escape the delimiters if they appear in the input,
962 so the output may be ambiguous.
963 </p>
964 </dd>
966 porcelain
967 </dt>
968 <dd>
969 <p>
970 Use a special line-based format intended for script
971 consumption. Added/removed/unchanged runs are printed in the
972 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
973 character at the beginning of the line and extending to the
974 end of the line. Newlines in the input are represented by a
975 tilde <tt>~</tt> on a line of its own.
976 </p>
977 </dd>
979 none
980 </dt>
981 <dd>
982 <p>
983 Disable word diff again.
984 </p>
985 </dd>
986 </dl></div>
988 highlight the changed parts in all modes if enabled.</p></div>
989 </dd>
991 --word-diff-regex=<regex>
992 </dt>
993 <dd>
994 <p>
995 Use <regex> to decide what a word is, instead of considering
996 runs of non-whitespace to be a word. Also implies
997 <tt>--word-diff</tt> unless it was already enabled.
998 </p>
1000 <regex> is considered a word. Anything between these matches is
1001 considered whitespace and ignored(!) for the purposes of finding
1002 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
1003 expression to make sure that it matches all non-whitespace characters.
1004 A match that contains a newline is silently truncated(!) at the
1005 newline.</p></div>
1006 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1007 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
1008 overrides any diff driver or configuration setting. Diff drivers
1009 override configuration settings.</p></div>
1010 </dd>
1012 --color-words[=<regex>]
1013 </dt>
1014 <dd>
1015 <p>
1016 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
1017 specified) <tt>--word-diff-regex=<regex></tt>.
1018 </p>
1019 </dd>
1021 --no-renames
1022 </dt>
1023 <dd>
1024 <p>
1025 Turn off rename detection, even when the configuration
1026 file gives the default to do so.
1027 </p>
1028 </dd>
1030 --check
1031 </dt>
1032 <dd>
1033 <p>
1034 Warn if changes introduce whitespace errors. What are
1035 considered whitespace errors is controlled by <tt>core.whitespace</tt>
1036 configuration. By default, trailing whitespaces (including
1037 lines that solely consist of whitespaces) and a space character
1038 that is immediately followed by a tab character inside the
1039 initial indent of the line are considered whitespace errors.
1040 Exits with non-zero status if problems are found. Not compatible
1041 with --exit-code.
1042 </p>
1043 </dd>
1045 --full-index
1046 </dt>
1047 <dd>
1048 <p>
1049 Instead of the first handful of characters, show the full
1051 line when generating patch format output.
1052 </p>
1053 </dd>
1055 --binary
1056 </dt>
1057 <dd>
1058 <p>
1059 In addition to <tt>--full-index</tt>, output a binary diff that
1060 can be applied with <tt>git-apply</tt>.
1061 </p>
1062 </dd>
1064 --abbrev[=<n>]
1065 </dt>
1066 <dd>
1067 <p>
1068 Instead of showing the full 40-byte hexadecimal object
1069 name in diff-raw format output and diff-tree header
1070 lines, show only a partial prefix. This is
1071 independent of the <tt>--full-index</tt> option above, which controls
1072 the diff-patch output format. Non default number of
1073 digits can be specified with <tt>--abbrev=<n></tt>.
1074 </p>
1075 </dd>
1077 -B[<n>][/<m>]
1078 </dt>
1080 --break-rewrites[=[<n>][/<m>]]
1081 </dt>
1082 <dd>
1083 <p>
1084 Break complete rewrite changes into pairs of delete and
1085 create. This serves two purposes:
1086 </p>
1087 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1088 not as a series of deletion and insertion mixed together with a very
1089 few lines that happen to match textually as the context, but as a
1090 single deletion of everything old followed by a single insertion of
1091 everything new, and the number <tt>m</tt> controls this aspect of the -B
1092 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
1093 original should remain in the result for git to consider it a total
1094 rewrite (i.e. otherwise the resulting patch will be a series of
1095 deletion and insertion mixed together with context lines).</p></div>
1096 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1097 source of a rename (usually -M only considers a file that disappeared
1098 as the source of a rename), and the number <tt>n</tt> controls this aspect of
1099 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
1100 addition and deletion compared to 20% or more of the file’s size are
1101 eligible for being picked up as a possible source of a rename to
1102 another file.</p></div>
1103 </dd>
1105 -M[<n>]
1106 </dt>
1108 --find-renames[=<n>]
1109 </dt>
1110 <dd>
1111 <p>
1112 Detect renames.
1113 If <tt>n</tt> is specified, it is a threshold on the similarity
1114 index (i.e. amount of addition/deletions compared to the
1115 file’s size). For example, <tt>-M90%</tt> means git should consider a
1116 delete/add pair to be a rename if more than 90% of the file
1117 hasn’t changed.
1118 </p>
1119 </dd>
1121 -C[<n>]
1122 </dt>
1124 --find-copies[=<n>]
1125 </dt>
1126 <dd>
1127 <p>
1128 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
1129 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
1130 </p>
1131 </dd>
1133 --find-copies-harder
1134 </dt>
1135 <dd>
1136 <p>
1137 For performance reasons, by default, <tt>-C</tt> option finds copies only
1138 if the original file of the copy was modified in the same
1139 changeset. This flag makes the command
1140 inspect unmodified files as candidates for the source of
1141 copy. This is a very expensive operation for large
1142 projects, so use it with caution. Giving more than one
1143 <tt>-C</tt> option has the same effect.
1144 </p>
1145 </dd>
1147 -D
1148 </dt>
1150 --irreversible-delete
1151 </dt>
1152 <dd>
1153 <p>
1154 Omit the preimage for deletes, i.e. print only the header but not
1155 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
1156 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
1157 solely for people who want to just concentrate on reviewing the
1158 text after the change. In addition, the output obviously lack
1159 enough information to apply such a patch in reverse, even manually,
1160 hence the name of the option.
1161 </p>
1162 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
1163 of a delete/create pair.</p></div>
1164 </dd>
1166 -l<num>
1167 </dt>
1168 <dd>
1169 <p>
1170 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
1171 is the number of potential rename/copy targets. This
1172 option prevents rename/copy detection from running if
1173 the number of rename/copy targets exceeds the specified
1174 number.
1175 </p>
1176 </dd>
1178 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1179 </dt>
1180 <dd>
1181 <p>
1182 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
1183 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
1184 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
1185 are Unmerged (<tt>U</tt>), are
1186 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
1187 Any combination of the filter characters (including none) can be used.
1188 When <tt>*</tt> (All-or-none) is added to the combination, all
1189 paths are selected if there is any file that matches
1190 other criteria in the comparison; if there is no file
1191 that matches other criteria, nothing is selected.
1192 </p>
1193 </dd>
1195 -S<string>
1196 </dt>
1197 <dd>
1198 <p>
1199 Look for differences that introduce or remove an instance of
1200 <string>. Note that this is different than the string simply
1201 appearing in diff output; see the <em>pickaxe</em> entry in
1203 </p>
1204 </dd>
1206 -G<regex>
1207 </dt>
1208 <dd>
1209 <p>
1210 Look for differences whose added or removed line matches
1211 the given <regex>.
1212 </p>
1213 </dd>
1215 --pickaxe-all
1216 </dt>
1217 <dd>
1218 <p>
1219 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
1220 changeset, not just the files that contain the change
1221 in <string>.
1222 </p>
1223 </dd>
1225 --pickaxe-regex
1226 </dt>
1227 <dd>
1228 <p>
1229 Make the <string> not a plain string but an extended POSIX
1230 regex to match.
1231 </p>
1232 </dd>
1234 -O<orderfile>
1235 </dt>
1236 <dd>
1237 <p>
1238 Output the patch in the order specified in the
1239 <orderfile>, which has one shell glob pattern per line.
1240 </p>
1241 </dd>
1243 -R
1244 </dt>
1245 <dd>
1246 <p>
1247 Swap two inputs; that is, show differences from index or
1248 on-disk file to tree contents.
1249 </p>
1250 </dd>
1252 --relative[=<path>]
1253 </dt>
1254 <dd>
1255 <p>
1256 When run from a subdirectory of the project, it can be
1257 told to exclude changes outside the directory and show
1258 pathnames relative to it with this option. When you are
1259 not in a subdirectory (e.g. in a bare repository), you
1260 can name which subdirectory to make the output relative
1261 to by giving a <path> as an argument.
1262 </p>
1263 </dd>
1265 -a
1266 </dt>
1268 --text
1269 </dt>
1270 <dd>
1271 <p>
1272 Treat all files as text.
1273 </p>
1274 </dd>
1276 --ignore-space-at-eol
1277 </dt>
1278 <dd>
1279 <p>
1280 Ignore changes in whitespace at EOL.
1281 </p>
1282 </dd>
1284 -b
1285 </dt>
1287 --ignore-space-change
1288 </dt>
1289 <dd>
1290 <p>
1291 Ignore changes in amount of whitespace. This ignores whitespace
1292 at line end, and considers all other sequences of one or
1293 more whitespace characters to be equivalent.
1294 </p>
1295 </dd>
1297 -w
1298 </dt>
1300 --ignore-all-space
1301 </dt>
1302 <dd>
1303 <p>
1304 Ignore whitespace when comparing lines. This ignores
1305 differences even if one line has whitespace where the other
1306 line has none.
1307 </p>
1308 </dd>
1310 --inter-hunk-context=<lines>
1311 </dt>
1312 <dd>
1313 <p>
1314 Show the context between diff hunks, up to the specified number
1315 of lines, thereby fusing hunks that are close to each other.
1316 </p>
1317 </dd>
1319 --exit-code
1320 </dt>
1321 <dd>
1322 <p>
1323 Make the program exit with codes similar to diff(1).
1324 That is, it exits with 1 if there were differences and
1325 0 means no differences.
1326 </p>
1327 </dd>
1329 --quiet
1330 </dt>
1331 <dd>
1332 <p>
1333 Disable all output of the program. Implies <tt>--exit-code</tt>.
1334 </p>
1335 </dd>
1337 --ext-diff
1338 </dt>
1339 <dd>
1340 <p>
1341 Allow an external diff helper to be executed. If you set an
1344 </p>
1345 </dd>
1347 --no-ext-diff
1348 </dt>
1349 <dd>
1350 <p>
1351 Disallow external diff drivers.
1352 </p>
1353 </dd>
1355 --textconv
1356 </dt>
1358 --no-textconv
1359 </dt>
1360 <dd>
1361 <p>
1362 Allow (or disallow) external text conversion filters to be run
1364 details. Because textconv filters are typically a one-way
1365 conversion, the resulting diff is suitable for human
1366 consumption, but cannot be applied. For this reason, textconv
1368 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1369 diff plumbing commands.
1370 </p>
1371 </dd>
1373 --ignore-submodules[=<when>]
1374 </dt>
1375 <dd>
1376 <p>
1377 Ignore changes to submodules in the diff generation. <when> can be
1380 untracked or modified files or its HEAD differs from the commit recorded
1381 in the superproject and can be used to override any settings of the
1382 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1384 contain untracked content (but they are still scanned for modified
1386 only changes to the commits stored in the superproject are shown (this was
1388 </p>
1389 </dd>
1391 --src-prefix=<prefix>
1392 </dt>
1393 <dd>
1394 <p>
1396 </p>
1397 </dd>
1399 --dst-prefix=<prefix>
1400 </dt>
1401 <dd>
1402 <p>
1404 </p>
1405 </dd>
1407 --no-prefix
1408 </dt>
1409 <dd>
1410 <p>
1411 Do not show any source or destination prefix.
1412 </p>
1413 </dd>
1414 </dl></div>
1419 <path>…
1420 </dt>
1421 <dd>
1422 <p>
1423 The <paths> parameters, when given, are used to limit
1424 the diff to the named paths (you can give directory
1425 names and get diff for all files under them).
1426 </p>
1427 </dd>
1428 </dl></div>
1429 </div>
1435 compared differs:</p></div>
1438 git-diff-index <tree-ish>
1439 </dt>
1440 <dd>
1441 <p>
1442 compares the <tree-ish> and the files on the filesystem.
1443 </p>
1444 </dd>
1446 git-diff-index --cached <tree-ish>
1447 </dt>
1448 <dd>
1449 <p>
1450 compares the <tree-ish> and the index.
1451 </p>
1452 </dd>
1454 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1455 </dt>
1456 <dd>
1457 <p>
1458 compares the trees named by the two arguments.
1459 </p>
1460 </dd>
1462 git-diff-files [<pattern>…]
1463 </dt>
1464 <dd>
1465 <p>
1466 compares the index and the files on the filesystem.
1467 </p>
1468 </dd>
1469 </dl></div>
1470 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1471 what is being compared. After that, all the commands print one output
1472 line per changed file.</p></div>
1476 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1477 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1478 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1479 create :000000 100644 0000000... 1234567... A file4
1480 delete :100644 000000 1234567... 0000000... D file5
1481 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1482 </div></div>
1485 <li>
1486 <p>
1487 a colon.
1488 </p>
1489 </li>
1490 <li>
1491 <p>
1493 </p>
1494 </li>
1495 <li>
1496 <p>
1497 a space.
1498 </p>
1499 </li>
1500 <li>
1501 <p>
1503 </p>
1504 </li>
1505 <li>
1506 <p>
1507 a space.
1508 </p>
1509 </li>
1510 <li>
1511 <p>
1513 </p>
1514 </li>
1515 <li>
1516 <p>
1517 a space.
1518 </p>
1519 </li>
1520 <li>
1521 <p>
1523 </p>
1524 </li>
1525 <li>
1526 <p>
1527 a space.
1528 </p>
1529 </li>
1530 <li>
1531 <p>
1533 </p>
1534 </li>
1535 <li>
1536 <p>
1537 a tab or a NUL when <em>-z</em> option is used.
1538 </p>
1539 </li>
1540 <li>
1541 <p>
1543 </p>
1544 </li>
1545 <li>
1546 <p>
1547 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1548 </p>
1549 </li>
1550 <li>
1551 <p>
1553 </p>
1554 </li>
1555 <li>
1556 <p>
1557 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1558 </p>
1559 </li>
1560 </ol></div>
1563 <li>
1564 <p>
1565 A: addition of a file
1566 </p>
1567 </li>
1568 <li>
1569 <p>
1570 C: copy of a file into a new one
1571 </p>
1572 </li>
1573 <li>
1574 <p>
1575 D: deletion of a file
1576 </p>
1577 </li>
1578 <li>
1579 <p>
1580 M: modification of the contents or mode of a file
1581 </p>
1582 </li>
1583 <li>
1584 <p>
1585 R: renaming of a file
1586 </p>
1587 </li>
1588 <li>
1589 <p>
1590 T: change in the type of the file
1591 </p>
1592 </li>
1593 <li>
1594 <p>
1595 U: file is unmerged (you must complete the merge before it can
1596 be committed)
1597 </p>
1598 </li>
1599 <li>
1600 <p>
1602 </p>
1603 </li>
1604 </ul></div>
1606 percentage of similarity between the source and target of the move or
1607 copy), and are the only ones to be so.</p></div>
1608 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1609 and it is out of sync with the index.</p></div>
1613 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1614 </div></div>
1615 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1616 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1617 respectively.</p></div>
1618 </div>
1622 can take <em>-c</em> or <em>--cc</em> option
1623 to generate diff output also for merge commits. The output differs
1624 from the format described above in the following way:</p></div>
1626 <li>
1627 <p>
1628 there is a colon for each parent
1629 </p>
1630 </li>
1631 <li>
1632 <p>
1634 </p>
1635 </li>
1636 <li>
1637 <p>
1638 status is concatenated status characters for each parent
1639 </p>
1640 </li>
1641 <li>
1642 <p>
1644 </p>
1645 </li>
1646 <li>
1647 <p>
1649 </p>
1650 </li>
1651 </ol></div>
1655 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1656 </div></div>
1657 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1658 all parents.</p></div>
1659 </div>
1665 do not produce the output described above; instead they produce a
1666 patch file. You can customize the creation of such patches via the
1667 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1668 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1669 diff format:</p></div>
1671 <li>
1672 <p>
1674 </p>
1677 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1678 </div></div>
1679 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1680 involved. Especially, even for a creation or a deletion,
1681 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1682 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1683 name of the source file of the rename/copy and the name of
1684 the file that rename/copy produces, respectively.</p></div>
1685 </li>
1686 <li>
1687 <p>
1688 It is followed by one or more extended header lines:
1689 </p>
1692 <pre><tt>old mode <mode>
1693 new mode <mode>
1694 deleted file mode <mode>
1695 new file mode <mode>
1696 copy from <path>
1697 copy to <path>
1698 rename from <path>
1699 rename to <path>
1700 similarity index <number>
1701 dissimilarity index <number>
1702 index <hash>..<hash> <mode></tt></pre>
1703 </div></div>
1704 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1705 and file permission bits.</p></div>
1706 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1708 the dissimilarity index is the percentage of changed lines. It
1709 is a rounded down integer, followed by a percent sign. The
1710 similarity index value of 100% is thus reserved for two equal
1711 files, while 100% dissimilarity means that no line from the old
1712 file made it into the new one.</p></div>
1713 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1714 The <mode> is included if the file mode does not change; otherwise,
1715 separate lines indicate the old and the new mode.</p></div>
1716 </li>
1717 <li>
1718 <p>
1719 TAB, LF, double quote and backslash characters in pathnames
1721 If there is need for such substitution then the whole
1722 pathname is put in double quotes.
1723 </p>
1724 </li>
1725 <li>
1726 <p>
1729 It is incorrect to apply each change to each file sequentially. For
1730 example, this patch will swap a and b:
1731 </p>
1734 <pre><tt>diff --git a/a b/b
1735 rename from a
1736 rename to b
1737 diff --git a/b b/a
1738 rename from b
1739 rename to a</tt></pre>
1740 </div></div>
1741 </li>
1742 </ol></div>
1743 </div>
1746 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1749 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1750 of these commands to force generation of diffs with individual parents
1751 of a merge.</p></div>
1755 <pre><tt>diff --combined describe.c
1756 index fabadb8,cc95eb0..4866510
1757 --- a/describe.c
1758 +++ b/describe.c
1761 }
1763 - static void describe(char *arg)
1764 -static void describe(struct commit *cmit, int last_one)
1765 ++static void describe(char *arg, int last_one)
1766 {
1767 + unsigned char sha1[20];
1768 + struct commit *cmit;
1769 struct commit_list *list;
1770 static int initialized = 0;
1771 struct commit_name *n;
1774 + usage(describe_usage);
1775 + cmit = lookup_commit_reference(sha1);
1776 + if (!cmit)
1777 + usage(describe_usage);
1778 +
1779 if (!initialized) {
1780 initialized = 1;
1781 for_each_ref(get_name);</tt></pre>
1782 </div></div>
1784 <li>
1785 <p>
1786 It is preceded with a "git diff" header, that looks like
1788 </p>
1792 </div></div>
1797 </div></div>
1798 </li>
1799 <li>
1800 <p>
1801 It is followed by one or more extended header lines
1802 (this example shows a merge with two parents):
1803 </p>
1810 </div></div>
1811 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1813 information about detected contents movement (renames and
1814 copying detection) are designed to work with diff of two
1816 </li>
1817 <li>
1818 <p>
1819 It is followed by two-line from-file/to-file header
1820 </p>
1823 <pre><tt>--- a/file
1824 +++ b/file</tt></pre>
1825 </div></div>
1828 files.</p></div>
1829 </li>
1830 <li>
1831 <p>
1832 Chunk header format is modified to prevent people from
1834 was created for review of merge commit changes, and was not
1835 meant for apply. The change is similar to the change in the
1837 </p>
1840 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1841 </div></div>
1843 header for combined diff format.</p></div>
1844 </li>
1845 </ol></div>
1847 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
1849 compares two or more files file1, file2,… with one file X, and
1850 shows how X differs from each of fileN. One column for each of
1851 fileN is prepended to the output line to note how X’s line is
1852 different from it.</p></div>
1853 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1855 in the column N means that the line appears in the result,
1856 and fileN does not have that line (in other words, the line was
1857 added, from the point of view of that parent).</p></div>
1861 in either file1 nor file2). Also eight other lines are the same
1863 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1864 merge commit with the merge result (i.e. file1..fileN are the
1866 two unresolved merge parents with the working tree file
1869 </div>
1872 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1874 output. These options can be combined with other options, such as
1876 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1877 formats the pathnames compactly by combining common prefix and suffix of
1883 </div></div>
1884 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1886 like this:</p></div>
1891 </div></div>
1894 <li>
1895 <p>
1896 the number of added lines;
1897 </p>
1898 </li>
1899 <li>
1900 <p>
1901 a tab;
1902 </p>
1903 </li>
1904 <li>
1905 <p>
1906 the number of deleted lines;
1907 </p>
1908 </li>
1909 <li>
1910 <p>
1911 a tab;
1912 </p>
1913 </li>
1914 <li>
1915 <p>
1916 pathname (possibly with rename/copy information);
1917 </p>
1918 </li>
1919 <li>
1920 <p>
1921 a newline.
1922 </p>
1923 </li>
1924 </ol></div>
1925 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1930 </div></div>
1933 <li>
1934 <p>
1935 the number of added lines;
1936 </p>
1937 </li>
1938 <li>
1939 <p>
1940 a tab;
1941 </p>
1942 </li>
1943 <li>
1944 <p>
1945 the number of deleted lines;
1946 </p>
1947 </li>
1948 <li>
1949 <p>
1950 a tab;
1951 </p>
1952 </li>
1953 <li>
1954 <p>
1955 a NUL (only exists if renamed/copied);
1956 </p>
1957 </li>
1958 <li>
1959 <p>
1960 pathname in preimage;
1961 </p>
1962 </li>
1963 <li>
1964 <p>
1965 a NUL (only exists if renamed/copied);
1966 </p>
1967 </li>
1968 <li>
1969 <p>
1970 pathname in postimage (only exists if renamed/copied);
1971 </p>
1972 </li>
1973 <li>
1974 <p>
1975 a NUL.
1976 </p>
1977 </li>
1978 </ol></div>
1979 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1980 scripts that read the output to tell if the current record being read is
1981 a single-path record or a rename/copy record without reading ahead.
1984 </div>
1989 Various ways to check your working tree
1990 </dt>
1991 <dd>
1997 </div></div>
1999 <li>
2000 <p>
2001 Changes in the working tree not yet staged for the next commit.
2002 </p>
2003 </li>
2004 <li>
2005 <p>
2006 Changes between the index and your last commit; what you
2008 </p>
2009 </li>
2010 <li>
2011 <p>
2012 Changes in the working tree since your last commit; what you
2013 would be committing if you run "git commit -a"
2014 </p>
2015 </li>
2016 </ol></div>
2017 </dd>
2019 Comparing with arbitrary commits
2020 </dt>
2021 <dd>
2027 </div></div>
2029 <li>
2030 <p>
2031 Instead of using the tip of the current branch, compare with the
2032 tip of "test" branch.
2033 </p>
2034 </li>
2035 <li>
2036 <p>
2037 Instead of comparing with the tip of "test" branch, compare with
2038 the tip of the current branch, but limit the comparison to the
2039 file "test".
2040 </p>
2041 </li>
2042 <li>
2043 <p>
2044 Compare the version before the last commit and the last commit.
2045 </p>
2046 </li>
2047 </ol></div>
2048 </dd>
2050 Comparing branches
2051 </dt>
2052 <dd>
2058 </div></div>
2060 <li>
2061 <p>
2062 Changes between the tips of the topic and the master branches.
2063 </p>
2064 </li>
2065 <li>
2066 <p>
2067 Same as above.
2068 </p>
2069 </li>
2070 <li>
2071 <p>
2072 Changes that occurred on the master branch since when the topic
2073 branch was started off it.
2074 </p>
2075 </li>
2076 </ol></div>
2077 </dd>
2079 Limiting the diff output
2080 </dt>
2081 <dd>
2087 </div></div>
2089 <li>
2090 <p>
2091 Show only modification, rename and copy, but not addition
2092 nor deletion.
2093 </p>
2094 </li>
2095 <li>
2096 <p>
2097 Show only names and the nature of change, but not actual
2098 diff output.
2099 </p>
2100 </li>
2101 <li>
2102 <p>
2103 Limit diff output to named subtrees.
2104 </p>
2105 </li>
2106 </ol></div>
2107 </dd>
2109 Munging the diff output
2110 </dt>
2111 <dd>
2116 </div></div>
2118 <li>
2119 <p>
2120 Spend extra cycles to find renames, copies and complete
2121 rewrites (very expensive).
2122 </p>
2123 </li>
2124 <li>
2125 <p>
2126 Output diff in reverse.
2127 </p>
2128 </li>
2129 </ol></div>
2130 </dd>
2131 </dl></div>
2132 </div>
2141 </div>
2145 </div>
2146 </div>
2151 </div>
2152 </div>
2153 </body>
2154 </html>