| blob | 59a2de27e057e9eeb31d23fed20bba1da728246d |
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-tree(1) Manual Page
574 </h1>
577 <p>git-diff-tree -
578 Compares the content and mode of blobs found via two tree objects
579 </p>
580 </div>
581 </div>
586 <div class="verseblock-content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
590 </div></div>
591 </div>
594 <div class="paragraph"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>
595 <div class="paragraph"><p>If there is only one <tree-ish> given, the commit is compared with its parents
596 (see --stdin below).</p></div>
597 <div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
598 </div>
603 -p
604 </dt>
606 -u
607 </dt>
609 --patch
610 </dt>
611 <dd>
612 <p>
613 Generate patch (see section on generating patches).
615 </p>
616 </dd>
619 </dt>
622 </dt>
623 <dd>
624 <p>
626 the usual three.
628 </p>
629 </dd>
631 --raw
632 </dt>
633 <dd>
634 <p>
635 Generate the raw format.
636 This is the default.
637 </p>
638 </dd>
640 --patch-with-raw
641 </dt>
642 <dd>
643 <p>
645 </p>
646 </dd>
648 --minimal
649 </dt>
650 <dd>
651 <p>
652 Spend extra time to make sure the smallest possible
653 diff is produced.
654 </p>
655 </dd>
657 --patience
658 </dt>
659 <dd>
660 <p>
661 Generate a diff using the "patience diff" algorithm.
662 </p>
663 </dd>
666 </dt>
667 <dd>
668 <p>
669 Generate a diffstat. You can override the default
671 The width of the filename part can be controlled by
672 giving another width to it separated by a comma.
676 </p>
677 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
678 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
679 </dd>
681 --numstat
682 </dt>
683 <dd>
684 <p>
686 deleted lines in decimal notation and pathname without
687 abbreviation, to make it more machine friendly. For
690 </p>
691 </dd>
693 --shortstat
694 </dt>
695 <dd>
696 <p>
698 number of modified files, as well as number of added and deleted
699 lines.
700 </p>
701 </dd>
704 </dt>
705 <dd>
706 <p>
707 Output the distribution of relative amount of changes for each
709 passing it a comma separated list of parameters.
712 The following parameters are available:
713 </p>
717 </dt>
718 <dd>
719 <p>
720 Compute the dirstat numbers by counting the lines that have been
721 removed from the source, or added to the destination. This ignores
722 the amount of pure code movements within a file. In other words,
723 rearranging lines in a file is not counted as much as other changes.
724 This is the default behavior when no parameter is given.
725 </p>
726 </dd>
729 </dt>
730 <dd>
731 <p>
732 Compute the dirstat numbers by doing the regular line-based diff
733 analysis, and summing the removed/added line counts. (For binary
734 files, count 64-byte chunks instead, since binary files have no
737 lines within a file as much as other changes. The resulting output
739 </p>
740 </dd>
743 </dt>
744 <dd>
745 <p>
746 Compute the dirstat numbers by counting the number of files changed.
747 Each changed file counts equally in the dirstat analysis. This is
749 not have to look at the file contents at all.
750 </p>
751 </dd>
754 </dt>
755 <dd>
756 <p>
757 Count changes in a child directory for the parent directory as well.
759 reported may exceed 100%. The default (non-cumulative) behavior can
761 </p>
762 </dd>
765 </dt>
766 <dd>
767 <p>
768 An integer parameter specifies a cut-off percent (3% by default).
769 Directories contributing less than this percentage of the changes
770 are not shown in the output.
771 </p>
772 </dd>
773 </dl></div>
775 directories with less than 10% of the total amount of changed files,
776 and accumulating child directory counts in the parent directories:
778 </dd>
780 --summary
781 </dt>
782 <dd>
783 <p>
784 Output a condensed summary of extended header information
785 such as creations, renames and mode changes.
786 </p>
787 </dd>
789 --patch-with-stat
790 </dt>
791 <dd>
792 <p>
794 </p>
795 </dd>
797 -z
798 </dt>
799 <dd>
800 <p>
801 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
802 given, do not munge pathnames and use NULs as output field terminators.
803 </p>
804 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
806 respectively, and the pathname will be enclosed in double quotes if
807 any of those replacements occurred.</p></div>
808 </dd>
810 --name-only
811 </dt>
812 <dd>
813 <p>
814 Show only names of changed files.
815 </p>
816 </dd>
818 --name-status
819 </dt>
820 <dd>
821 <p>
822 Show only names and status of changed files. See the description
823 of the <tt>--diff-filter</tt> option on what the status letters mean.
824 </p>
825 </dd>
827 --submodule[=<format>]
828 </dt>
829 <dd>
830 <p>
831 Chose the output format for submodule differences. <format> can be one of
832 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
833 is used when this option is not given. <em>log</em> is the default value for this
834 option and lists the commits in that commit range like the <em>summary</em>
836 </p>
837 </dd>
839 --color[=<when>]
840 </dt>
841 <dd>
842 <p>
843 Show colored diff.
844 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
845 The default value is <tt>never</tt>.
846 </p>
847 </dd>
849 --no-color
850 </dt>
851 <dd>
852 <p>
853 Turn off colored diff.
854 It is the same as <tt>--color=never</tt>.
855 </p>
856 </dd>
858 --word-diff[=<mode>]
859 </dt>
860 <dd>
861 <p>
862 Show a word diff, using the <mode> to delimit changed words.
863 By default, words are delimited by whitespace; see
864 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
865 must be one of:
866 </p>
869 color
870 </dt>
871 <dd>
872 <p>
873 Highlight changed words using only colors. Implies <tt>--color</tt>.
874 </p>
875 </dd>
877 plain
878 </dt>
879 <dd>
880 <p>
881 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
882 attempts to escape the delimiters if they appear in the input,
883 so the output may be ambiguous.
884 </p>
885 </dd>
887 porcelain
888 </dt>
889 <dd>
890 <p>
891 Use a special line-based format intended for script
892 consumption. Added/removed/unchanged runs are printed in the
893 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
894 character at the beginning of the line and extending to the
895 end of the line. Newlines in the input are represented by a
896 tilde <tt>~</tt> on a line of its own.
897 </p>
898 </dd>
900 none
901 </dt>
902 <dd>
903 <p>
904 Disable word diff again.
905 </p>
906 </dd>
907 </dl></div>
909 highlight the changed parts in all modes if enabled.</p></div>
910 </dd>
912 --word-diff-regex=<regex>
913 </dt>
914 <dd>
915 <p>
916 Use <regex> to decide what a word is, instead of considering
917 runs of non-whitespace to be a word. Also implies
918 <tt>--word-diff</tt> unless it was already enabled.
919 </p>
921 <regex> is considered a word. Anything between these matches is
922 considered whitespace and ignored(!) for the purposes of finding
923 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
924 expression to make sure that it matches all non-whitespace characters.
925 A match that contains a newline is silently truncated(!) at the
926 newline.</p></div>
927 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
928 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
929 overrides any diff driver or configuration setting. Diff drivers
930 override configuration settings.</p></div>
931 </dd>
933 --color-words[=<regex>]
934 </dt>
935 <dd>
936 <p>
937 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
938 specified) <tt>--word-diff-regex=<regex></tt>.
939 </p>
940 </dd>
942 --no-renames
943 </dt>
944 <dd>
945 <p>
946 Turn off rename detection, even when the configuration
947 file gives the default to do so.
948 </p>
949 </dd>
951 --check
952 </dt>
953 <dd>
954 <p>
955 Warn if changes introduce whitespace errors. What are
956 considered whitespace errors is controlled by <tt>core.whitespace</tt>
957 configuration. By default, trailing whitespaces (including
958 lines that solely consist of whitespaces) and a space character
959 that is immediately followed by a tab character inside the
960 initial indent of the line are considered whitespace errors.
961 Exits with non-zero status if problems are found. Not compatible
962 with --exit-code.
963 </p>
964 </dd>
966 --full-index
967 </dt>
968 <dd>
969 <p>
970 Instead of the first handful of characters, show the full
972 line when generating patch format output.
973 </p>
974 </dd>
976 --binary
977 </dt>
978 <dd>
979 <p>
980 In addition to <tt>--full-index</tt>, output a binary diff that
981 can be applied with <tt>git-apply</tt>.
982 </p>
983 </dd>
985 --abbrev[=<n>]
986 </dt>
987 <dd>
988 <p>
989 Instead of showing the full 40-byte hexadecimal object
990 name in diff-raw format output and diff-tree header
991 lines, show only a partial prefix. This is
992 independent of the <tt>--full-index</tt> option above, which controls
993 the diff-patch output format. Non default number of
994 digits can be specified with <tt>--abbrev=<n></tt>.
995 </p>
996 </dd>
998 -B[<n>][/<m>]
999 </dt>
1001 --break-rewrites[=[<n>][/<m>]]
1002 </dt>
1003 <dd>
1004 <p>
1005 Break complete rewrite changes into pairs of delete and
1006 create. This serves two purposes:
1007 </p>
1008 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1009 not as a series of deletion and insertion mixed together with a very
1010 few lines that happen to match textually as the context, but as a
1011 single deletion of everything old followed by a single insertion of
1012 everything new, and the number <tt>m</tt> controls this aspect of the -B
1013 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
1014 original should remain in the result for git to consider it a total
1015 rewrite (i.e. otherwise the resulting patch will be a series of
1016 deletion and insertion mixed together with context lines).</p></div>
1017 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1018 source of a rename (usually -M only considers a file that disappeared
1019 as the source of a rename), and the number <tt>n</tt> controls this aspect of
1020 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
1021 addition and deletion compared to 20% or more of the file’s size are
1022 eligible for being picked up as a possible source of a rename to
1023 another file.</p></div>
1024 </dd>
1026 -M[<n>]
1027 </dt>
1029 --find-renames[=<n>]
1030 </dt>
1031 <dd>
1032 <p>
1033 Detect renames.
1034 If <tt>n</tt> is specified, it is a threshold on the similarity
1035 index (i.e. amount of addition/deletions compared to the
1036 file’s size). For example, <tt>-M90%</tt> means git should consider a
1037 delete/add pair to be a rename if more than 90% of the file
1038 hasn’t changed.
1039 </p>
1040 </dd>
1042 -C[<n>]
1043 </dt>
1045 --find-copies[=<n>]
1046 </dt>
1047 <dd>
1048 <p>
1049 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
1050 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
1051 </p>
1052 </dd>
1054 --find-copies-harder
1055 </dt>
1056 <dd>
1057 <p>
1058 For performance reasons, by default, <tt>-C</tt> option finds copies only
1059 if the original file of the copy was modified in the same
1060 changeset. This flag makes the command
1061 inspect unmodified files as candidates for the source of
1062 copy. This is a very expensive operation for large
1063 projects, so use it with caution. Giving more than one
1064 <tt>-C</tt> option has the same effect.
1065 </p>
1066 </dd>
1068 -D
1069 </dt>
1071 --irreversible-delete
1072 </dt>
1073 <dd>
1074 <p>
1075 Omit the preimage for deletes, i.e. print only the header but not
1076 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
1077 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
1078 solely for people who want to just concentrate on reviewing the
1079 text after the change. In addition, the output obviously lack
1080 enough information to apply such a patch in reverse, even manually,
1081 hence the name of the option.
1082 </p>
1083 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
1084 of a delete/create pair.</p></div>
1085 </dd>
1087 -l<num>
1088 </dt>
1089 <dd>
1090 <p>
1091 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
1092 is the number of potential rename/copy targets. This
1093 option prevents rename/copy detection from running if
1094 the number of rename/copy targets exceeds the specified
1095 number.
1096 </p>
1097 </dd>
1099 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1100 </dt>
1101 <dd>
1102 <p>
1103 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
1104 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
1105 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
1106 are Unmerged (<tt>U</tt>), are
1107 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
1108 Any combination of the filter characters (including none) can be used.
1109 When <tt>*</tt> (All-or-none) is added to the combination, all
1110 paths are selected if there is any file that matches
1111 other criteria in the comparison; if there is no file
1112 that matches other criteria, nothing is selected.
1113 </p>
1114 </dd>
1116 -S<string>
1117 </dt>
1118 <dd>
1119 <p>
1120 Look for differences that introduce or remove an instance of
1121 <string>. Note that this is different than the string simply
1122 appearing in diff output; see the <em>pickaxe</em> entry in
1124 </p>
1125 </dd>
1127 -G<regex>
1128 </dt>
1129 <dd>
1130 <p>
1131 Look for differences whose added or removed line matches
1132 the given <regex>.
1133 </p>
1134 </dd>
1136 --pickaxe-all
1137 </dt>
1138 <dd>
1139 <p>
1140 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
1141 changeset, not just the files that contain the change
1142 in <string>.
1143 </p>
1144 </dd>
1146 --pickaxe-regex
1147 </dt>
1148 <dd>
1149 <p>
1150 Make the <string> not a plain string but an extended POSIX
1151 regex to match.
1152 </p>
1153 </dd>
1155 -O<orderfile>
1156 </dt>
1157 <dd>
1158 <p>
1159 Output the patch in the order specified in the
1160 <orderfile>, which has one shell glob pattern per line.
1161 </p>
1162 </dd>
1164 -R
1165 </dt>
1166 <dd>
1167 <p>
1168 Swap two inputs; that is, show differences from index or
1169 on-disk file to tree contents.
1170 </p>
1171 </dd>
1173 --relative[=<path>]
1174 </dt>
1175 <dd>
1176 <p>
1177 When run from a subdirectory of the project, it can be
1178 told to exclude changes outside the directory and show
1179 pathnames relative to it with this option. When you are
1180 not in a subdirectory (e.g. in a bare repository), you
1181 can name which subdirectory to make the output relative
1182 to by giving a <path> as an argument.
1183 </p>
1184 </dd>
1186 -a
1187 </dt>
1189 --text
1190 </dt>
1191 <dd>
1192 <p>
1193 Treat all files as text.
1194 </p>
1195 </dd>
1197 --ignore-space-at-eol
1198 </dt>
1199 <dd>
1200 <p>
1201 Ignore changes in whitespace at EOL.
1202 </p>
1203 </dd>
1205 -b
1206 </dt>
1208 --ignore-space-change
1209 </dt>
1210 <dd>
1211 <p>
1212 Ignore changes in amount of whitespace. This ignores whitespace
1213 at line end, and considers all other sequences of one or
1214 more whitespace characters to be equivalent.
1215 </p>
1216 </dd>
1218 -w
1219 </dt>
1221 --ignore-all-space
1222 </dt>
1223 <dd>
1224 <p>
1225 Ignore whitespace when comparing lines. This ignores
1226 differences even if one line has whitespace where the other
1227 line has none.
1228 </p>
1229 </dd>
1231 --inter-hunk-context=<lines>
1232 </dt>
1233 <dd>
1234 <p>
1235 Show the context between diff hunks, up to the specified number
1236 of lines, thereby fusing hunks that are close to each other.
1237 </p>
1238 </dd>
1240 --exit-code
1241 </dt>
1242 <dd>
1243 <p>
1244 Make the program exit with codes similar to diff(1).
1245 That is, it exits with 1 if there were differences and
1246 0 means no differences.
1247 </p>
1248 </dd>
1250 --quiet
1251 </dt>
1252 <dd>
1253 <p>
1254 Disable all output of the program. Implies <tt>--exit-code</tt>.
1255 </p>
1256 </dd>
1258 --ext-diff
1259 </dt>
1260 <dd>
1261 <p>
1262 Allow an external diff helper to be executed. If you set an
1265 </p>
1266 </dd>
1268 --no-ext-diff
1269 </dt>
1270 <dd>
1271 <p>
1272 Disallow external diff drivers.
1273 </p>
1274 </dd>
1276 --textconv
1277 </dt>
1279 --no-textconv
1280 </dt>
1281 <dd>
1282 <p>
1283 Allow (or disallow) external text conversion filters to be run
1285 details. Because textconv filters are typically a one-way
1286 conversion, the resulting diff is suitable for human
1287 consumption, but cannot be applied. For this reason, textconv
1289 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1290 diff plumbing commands.
1291 </p>
1292 </dd>
1294 --ignore-submodules[=<when>]
1295 </dt>
1296 <dd>
1297 <p>
1298 Ignore changes to submodules in the diff generation. <when> can be
1301 untracked or modified files or its HEAD differs from the commit recorded
1302 in the superproject and can be used to override any settings of the
1303 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1305 contain untracked content (but they are still scanned for modified
1307 only changes to the commits stored in the superproject are shown (this was
1309 </p>
1310 </dd>
1312 --src-prefix=<prefix>
1313 </dt>
1314 <dd>
1315 <p>
1317 </p>
1318 </dd>
1320 --dst-prefix=<prefix>
1321 </dt>
1322 <dd>
1323 <p>
1325 </p>
1326 </dd>
1328 --no-prefix
1329 </dt>
1330 <dd>
1331 <p>
1332 Do not show any source or destination prefix.
1333 </p>
1334 </dd>
1335 </dl></div>
1340 <tree-ish>
1341 </dt>
1342 <dd>
1343 <p>
1344 The id of a tree object.
1345 </p>
1346 </dd>
1348 <path>…
1349 </dt>
1350 <dd>
1351 <p>
1352 If provided, the results are limited to a subset of files
1353 matching one of these prefix strings.
1354 i.e., file matches <tt>/^<pattern1>|<pattern2>|…/</tt>
1355 Note that this parameter does not provide any wildcard or regexp
1356 features.
1357 </p>
1358 </dd>
1360 -r
1361 </dt>
1362 <dd>
1363 <p>
1364 recurse into sub-trees
1365 </p>
1366 </dd>
1368 -t
1369 </dt>
1370 <dd>
1371 <p>
1372 show tree entry itself as well as subtrees. Implies -r.
1373 </p>
1374 </dd>
1376 --root
1377 </dt>
1378 <dd>
1379 <p>
1380 When <em>--root</em> is specified the initial commit will be shown as a big
1381 creation event. This is equivalent to a diff against the NULL tree.
1382 </p>
1383 </dd>
1385 --stdin
1386 </dt>
1387 <dd>
1388 <p>
1389 When <em>--stdin</em> is specified, the command does not take
1390 <tree-ish> arguments from the command line. Instead, it
1391 reads lines containing either two <tree>, one <commit>, or a
1392 list of <commit> from its standard input. (Use a single space
1393 as separator.)
1394 </p>
1395 <div class="paragraph"><p>When two trees are given, it compares the first tree with the second.
1396 When a single commit is given, it compares the commit with its
1397 parents. The remaining commits, when given, are used as if they are
1398 parents of the first commit.</p></div>
1400 and terminated by a newline) is printed before the difference. When
1401 comparing commits, the ID of the first (or only) commit, followed by a
1402 newline, is printed.</p></div>
1404 commits (but not trees).</p></div>
1405 </dd>
1407 -m
1408 </dt>
1409 <dd>
1410 <p>
1411 By default, <em>git diff-tree --stdin</em> does not show
1412 differences for merge commits. With this flag, it shows
1413 differences to that commit from all of its parents. See
1414 also <em>-c</em>.
1415 </p>
1416 </dd>
1418 -s
1419 </dt>
1420 <dd>
1421 <p>
1422 By default, <em>git diff-tree --stdin</em> shows differences,
1423 either in machine-readable form (without <em>-p</em>) or in patch
1424 form (with <em>-p</em>). This output can be suppressed. It is
1425 only useful with <em>-v</em> flag.
1426 </p>
1427 </dd>
1429 -v
1430 </dt>
1431 <dd>
1432 <p>
1433 This flag causes <em>git diff-tree --stdin</em> to also show
1434 the commit message before the differences.
1435 </p>
1436 </dd>
1438 --pretty[=<format>]
1439 </dt>
1441 --format=<format>
1442 </dt>
1443 <dd>
1444 <p>
1445 Pretty-print the contents of the commit logs in a given format,
1446 where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
1447 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See
1449 format. When omitted, the format defaults to <em>medium</em>.
1450 </p>
1453 </dd>
1455 --abbrev-commit
1456 </dt>
1457 <dd>
1458 <p>
1459 Instead of showing the full 40-byte hexadecimal commit object
1460 name, show only a partial prefix. Non default number of
1462 diff output, if it is displayed).
1463 </p>
1465 people using 80-column terminals.</p></div>
1466 </dd>
1468 --no-abbrev-commit
1469 </dt>
1470 <dd>
1471 <p>
1472 Show the full 40-byte hexadecimal commit object name. This negates
1473 <tt>--abbrev-commit</tt> and those options which imply it such as
1475 </p>
1476 </dd>
1478 --oneline
1479 </dt>
1480 <dd>
1481 <p>
1483 used together.
1484 </p>
1485 </dd>
1487 --encoding[=<encoding>]
1488 </dt>
1489 <dd>
1490 <p>
1491 The commit objects record the encoding used for the log message
1492 in their encoding header; this option can be used to tell the
1493 command to re-code the commit log message in the encoding
1494 preferred by the user. For non plumbing commands this
1495 defaults to UTF-8.
1496 </p>
1497 </dd>
1499 --notes[=<ref>]
1500 </dt>
1501 <dd>
1502 <p>
1504 commit, when showing the commit log message. This is the default
1505 for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when
1506 there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given
1507 on the command line.
1508 </p>
1510 <em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding
1511 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
1512 <div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the
1513 default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it
1514 is not qualified.</p></div>
1519 </dd>
1521 --no-notes
1522 </dt>
1523 <dd>
1524 <p>
1525 Do not show notes. This negates the above <tt>--notes</tt> option, by
1526 resetting the list of notes refs from which notes are shown.
1527 Options are parsed in the order given on the command line, so e.g.
1530 </p>
1531 </dd>
1533 --show-notes[=<ref>]
1534 </dt>
1536 --[no-]standard-notes
1537 </dt>
1538 <dd>
1539 <p>
1540 These options are deprecated. Use the above --notes/--no-notes
1541 options instead.
1542 </p>
1543 </dd>
1545 --no-commit-id
1546 </dt>
1547 <dd>
1548 <p>
1549 <em>git diff-tree</em> outputs a line with the commit ID when
1550 applicable. This flag suppressed the commit ID output.
1551 </p>
1552 </dd>
1554 -c
1555 </dt>
1556 <dd>
1557 <p>
1558 This flag changes the way a merge commit is displayed
1559 (which means it is useful only when the command is given
1560 one <tree-ish>, or <em>--stdin</em>). It shows the differences
1561 from each of the parents to the merge result simultaneously
1562 instead of showing pairwise diff between a parent and the
1563 result one at a time (which is what the <em>-m</em> option does).
1564 Furthermore, it lists only files which were modified
1565 from all parents.
1566 </p>
1567 </dd>
1569 --cc
1570 </dt>
1571 <dd>
1572 <p>
1573 This flag changes the way a merge commit patch is displayed,
1574 in a similar way to the <em>-c</em> option. It implies the <em>-c</em>
1575 and <em>-p</em> options and further compresses the patch output
1576 by omitting uninteresting hunks whose the contents in the parents
1577 have only two variants and the merge result picks one of them
1578 without modification. When all hunks are uninteresting, the commit
1579 itself and the commit log message is not shown, just like in any other
1581 </p>
1582 </dd>
1584 --always
1585 </dt>
1586 <dd>
1587 <p>
1588 Show the commit itself and the commit log message even
1589 if the diff itself is empty.
1590 </p>
1591 </dd>
1592 </dl></div>
1593 </div>
1597 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
1598 inserted before the <em>Author:</em> line. This line begins with
1600 separated by spaces. Note that the listed commits may not
1601 necessarily be the list of the <strong>direct</strong> parent commits if you
1602 have limited your view of history: for example, if you are
1603 only interested in changes related to a certain directory or
1604 file.</p></div>
1606 additional formats by setting a pretty.<name>
1607 config option to either another format name, or a
1608 <em>format:</em> string, as described below (see
1610 built-in formats:</p></div>
1612 <li>
1613 <p>
1614 <em>oneline</em>
1615 </p>
1618 <pre><tt><sha1> <title line></tt></pre>
1619 </div></div>
1621 </li>
1622 <li>
1623 <p>
1624 <em>short</em>
1625 </p>
1628 <pre><tt>commit <sha1>
1629 Author: <author></tt></pre>
1630 </div></div>
1633 <pre><tt><title line></tt></pre>
1634 </div></div>
1635 </li>
1636 <li>
1637 <p>
1638 <em>medium</em>
1639 </p>
1642 <pre><tt>commit <sha1>
1643 Author: <author>
1644 Date: <author date></tt></pre>
1645 </div></div>
1648 <pre><tt><title line></tt></pre>
1649 </div></div>
1652 <pre><tt><full commit message></tt></pre>
1653 </div></div>
1654 </li>
1655 <li>
1656 <p>
1657 <em>full</em>
1658 </p>
1661 <pre><tt>commit <sha1>
1662 Author: <author>
1663 Commit: <committer></tt></pre>
1664 </div></div>
1667 <pre><tt><title line></tt></pre>
1668 </div></div>
1671 <pre><tt><full commit message></tt></pre>
1672 </div></div>
1673 </li>
1674 <li>
1675 <p>
1676 <em>fuller</em>
1677 </p>
1680 <pre><tt>commit <sha1>
1681 Author: <author>
1682 AuthorDate: <author date>
1683 Commit: <committer>
1684 CommitDate: <committer date></tt></pre>
1685 </div></div>
1688 <pre><tt><title line></tt></pre>
1689 </div></div>
1692 <pre><tt><full commit message></tt></pre>
1693 </div></div>
1694 </li>
1695 <li>
1696 <p>
1697 <em>email</em>
1698 </p>
1701 <pre><tt>From <sha1> <date>
1702 From: <author>
1703 Date: <author date>
1704 Subject: [PATCH] <title line></tt></pre>
1705 </div></div>
1708 <pre><tt><full commit message></tt></pre>
1709 </div></div>
1710 </li>
1711 <li>
1712 <p>
1713 <em>raw</em>
1714 </p>
1716 stored in the commit object. Notably, the SHA1s are
1717 displayed in full, regardless of whether --abbrev or
1718 --no-abbrev are used, and <em>parents</em> information show the
1719 true parent commits, without taking grafts nor history
1720 simplification into account.</p></div>
1721 </li>
1722 <li>
1723 <p>
1724 <em>format:<string></em>
1725 </p>
1726 <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information
1727 you want to show. It works a little bit like printf format,
1728 with the notable exception that you get a newline with <em>%n</em>
1729 instead of <em>\n</em>.</p></div>
1730 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1731 would show something like this:</p></div>
1734 <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
1735 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
1736 </div></div>
1739 <li>
1740 <p>
1741 <em>%H</em>: commit hash
1742 </p>
1743 </li>
1744 <li>
1745 <p>
1746 <em>%h</em>: abbreviated commit hash
1747 </p>
1748 </li>
1749 <li>
1750 <p>
1751 <em>%T</em>: tree hash
1752 </p>
1753 </li>
1754 <li>
1755 <p>
1756 <em>%t</em>: abbreviated tree hash
1757 </p>
1758 </li>
1759 <li>
1760 <p>
1761 <em>%P</em>: parent hashes
1762 </p>
1763 </li>
1764 <li>
1765 <p>
1766 <em>%p</em>: abbreviated parent hashes
1767 </p>
1768 </li>
1769 <li>
1770 <p>
1771 <em>%an</em>: author name
1772 </p>
1773 </li>
1774 <li>
1775 <p>
1776 <em>%aN</em>: author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1777 </p>
1778 </li>
1779 <li>
1780 <p>
1781 <em>%ae</em>: author email
1782 </p>
1783 </li>
1784 <li>
1785 <p>
1786 <em>%aE</em>: author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1787 </p>
1788 </li>
1789 <li>
1790 <p>
1791 <em>%ad</em>: author date (format respects --date= option)
1792 </p>
1793 </li>
1794 <li>
1795 <p>
1796 <em>%aD</em>: author date, RFC2822 style
1797 </p>
1798 </li>
1799 <li>
1800 <p>
1801 <em>%ar</em>: author date, relative
1802 </p>
1803 </li>
1804 <li>
1805 <p>
1806 <em>%at</em>: author date, UNIX timestamp
1807 </p>
1808 </li>
1809 <li>
1810 <p>
1811 <em>%ai</em>: author date, ISO 8601 format
1812 </p>
1813 </li>
1814 <li>
1815 <p>
1816 <em>%cn</em>: committer name
1817 </p>
1818 </li>
1819 <li>
1820 <p>
1821 <em>%cN</em>: committer name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1822 </p>
1823 </li>
1824 <li>
1825 <p>
1826 <em>%ce</em>: committer email
1827 </p>
1828 </li>
1829 <li>
1830 <p>
1831 <em>%cE</em>: committer email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1832 </p>
1833 </li>
1834 <li>
1835 <p>
1836 <em>%cd</em>: committer date
1837 </p>
1838 </li>
1839 <li>
1840 <p>
1841 <em>%cD</em>: committer date, RFC2822 style
1842 </p>
1843 </li>
1844 <li>
1845 <p>
1846 <em>%cr</em>: committer date, relative
1847 </p>
1848 </li>
1849 <li>
1850 <p>
1851 <em>%ct</em>: committer date, UNIX timestamp
1852 </p>
1853 </li>
1854 <li>
1855 <p>
1856 <em>%ci</em>: committer date, ISO 8601 format
1857 </p>
1858 </li>
1859 <li>
1860 <p>
1862 </p>
1863 </li>
1864 <li>
1865 <p>
1866 <em>%e</em>: encoding
1867 </p>
1868 </li>
1869 <li>
1870 <p>
1871 <em>%s</em>: subject
1872 </p>
1873 </li>
1874 <li>
1875 <p>
1876 <em>%f</em>: sanitized subject line, suitable for a filename
1877 </p>
1878 </li>
1879 <li>
1880 <p>
1881 <em>%b</em>: body
1882 </p>
1883 </li>
1884 <li>
1885 <p>
1886 <em>%B</em>: raw body (unwrapped subject and body)
1887 </p>
1888 </li>
1889 <li>
1890 <p>
1891 <em>%N</em>: commit notes
1892 </p>
1893 </li>
1894 <li>
1895 <p>
1896 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
1897 </p>
1898 </li>
1899 <li>
1900 <p>
1901 <em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt>
1902 </p>
1903 </li>
1904 <li>
1905 <p>
1906 <em>%gs</em>: reflog subject
1907 </p>
1908 </li>
1909 <li>
1910 <p>
1911 <em>%Cred</em>: switch color to red
1912 </p>
1913 </li>
1914 <li>
1915 <p>
1916 <em>%Cgreen</em>: switch color to green
1917 </p>
1918 </li>
1919 <li>
1920 <p>
1921 <em>%Cblue</em>: switch color to blue
1922 </p>
1923 </li>
1924 <li>
1925 <p>
1926 <em>%Creset</em>: reset color
1927 </p>
1928 </li>
1929 <li>
1930 <p>
1931 <em>%C(…)</em>: color specification, as described in color.branch.* config option
1932 </p>
1933 </li>
1934 <li>
1935 <p>
1936 <em>%m</em>: left, right or boundary mark
1937 </p>
1938 </li>
1939 <li>
1940 <p>
1941 <em>%n</em>: newline
1942 </p>
1943 </li>
1944 <li>
1945 <p>
1946 <em>%%</em>: a raw <em>%</em>
1947 </p>
1948 </li>
1949 <li>
1950 <p>
1951 <em>%x00</em>: print a byte from a hex code
1952 </p>
1953 </li>
1954 <li>
1955 <p>
1956 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
1958 </p>
1959 </li>
1960 </ul></div>
1961 </li>
1962 </ul></div>
1964 <table><tr>
1967 </td>
1969 revision traversal engine. For example, the <tt>%g*</tt> reflog options will
1970 insert an empty string unless we are traversing reflog entries (e.g., by
1972 format if <tt>--decorate</tt> was not already provided on the command line.</td>
1973 </tr></table>
1974 </div>
1975 <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
1976 is inserted immediately before the expansion if and only if the
1977 placeholder expands to a non-empty string.</p></div>
1978 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
1979 immediately precede the expansion are deleted if and only if the
1980 placeholder expands to an empty string.</p></div>
1982 is inserted immediately before the expansion if and only if the
1983 placeholder expands to a non-empty string.</p></div>
1985 <li>
1986 <p>
1987 <em>tformat:</em>
1988 </p>
1989 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1991 other words, each commit has the message terminator character (usually a
1992 newline) appended, rather than a separator placed between entries.
1993 This means that the final entry of a single-line format will be properly
1995 For example:</p></div>
1998 <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
2000 4da45be
2001 7134973 -- NO NEWLINE
2003 $ git log -2 --pretty=tformat:%h 4da45bef \
2005 4da45be
2006 7134973</tt></pre>
2007 </div></div>
2008 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
2009 as if it has <tt>tformat:</tt> in front of it. For example, these two are
2010 equivalent:</p></div>
2013 <pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef
2014 $ git log -2 --pretty=%h 4da45bef</tt></pre>
2015 </div></div>
2016 </li>
2017 </ul></div>
2018 </div>
2021 <div class="paragraph"><p>If you’re only interested in differences in a subset of files, for
2022 example some architecture-specific files, you might do:</p></div>
2025 <pre><tt>git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre>
2026 </div></div>
2027 <div class="paragraph"><p>and it will only show you what changed in those two directories.</p></div>
2028 <div class="paragraph"><p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p></div>
2031 <pre><tt>git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
2032 </div></div>
2034 <div class="paragraph"><p>The pattern is always the prefix, and is matched exactly. There are no
2035 wildcards. Even stricter, it has to match a complete path component.
2037 so it can be used to name subdirectories.</p></div>
2041 <pre><tt>torvalds@ppc970:~/git> git diff-tree --abbrev 5319e4
2042 :100664 100664 ac348b... a01513... git-fsck-objects.c</tt></pre>
2043 </div></div>
2044 <div class="paragraph"><p>which tells you that the last commit changed just one file (it’s from
2045 this one:</p></div>
2048 <pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
2049 tree 5319e4d609cdd282069cc4dce33c1db559539b03
2050 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
2051 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
2052 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
2056 Once I do the reference tracking, I'll also make it print out all the
2057 HEAD commits it finds, which is even more interesting.</tt></pre>
2058 </div></div>
2060 </div>
2066 compared differs:</p></div>
2069 git-diff-index <tree-ish>
2070 </dt>
2071 <dd>
2072 <p>
2073 compares the <tree-ish> and the files on the filesystem.
2074 </p>
2075 </dd>
2077 git-diff-index --cached <tree-ish>
2078 </dt>
2079 <dd>
2080 <p>
2081 compares the <tree-ish> and the index.
2082 </p>
2083 </dd>
2085 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
2086 </dt>
2087 <dd>
2088 <p>
2089 compares the trees named by the two arguments.
2090 </p>
2091 </dd>
2093 git-diff-files [<pattern>…]
2094 </dt>
2095 <dd>
2096 <p>
2097 compares the index and the files on the filesystem.
2098 </p>
2099 </dd>
2100 </dl></div>
2101 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
2102 what is being compared. After that, all the commands print one output
2103 line per changed file.</p></div>
2107 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
2108 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
2109 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
2110 create :000000 100644 0000000... 1234567... A file4
2111 delete :100644 000000 1234567... 0000000... D file5
2112 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
2113 </div></div>
2116 <li>
2117 <p>
2118 a colon.
2119 </p>
2120 </li>
2121 <li>
2122 <p>
2124 </p>
2125 </li>
2126 <li>
2127 <p>
2128 a space.
2129 </p>
2130 </li>
2131 <li>
2132 <p>
2134 </p>
2135 </li>
2136 <li>
2137 <p>
2138 a space.
2139 </p>
2140 </li>
2141 <li>
2142 <p>
2144 </p>
2145 </li>
2146 <li>
2147 <p>
2148 a space.
2149 </p>
2150 </li>
2151 <li>
2152 <p>
2154 </p>
2155 </li>
2156 <li>
2157 <p>
2158 a space.
2159 </p>
2160 </li>
2161 <li>
2162 <p>
2164 </p>
2165 </li>
2166 <li>
2167 <p>
2168 a tab or a NUL when <em>-z</em> option is used.
2169 </p>
2170 </li>
2171 <li>
2172 <p>
2174 </p>
2175 </li>
2176 <li>
2177 <p>
2178 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
2179 </p>
2180 </li>
2181 <li>
2182 <p>
2184 </p>
2185 </li>
2186 <li>
2187 <p>
2188 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
2189 </p>
2190 </li>
2191 </ol></div>
2194 <li>
2195 <p>
2196 A: addition of a file
2197 </p>
2198 </li>
2199 <li>
2200 <p>
2201 C: copy of a file into a new one
2202 </p>
2203 </li>
2204 <li>
2205 <p>
2206 D: deletion of a file
2207 </p>
2208 </li>
2209 <li>
2210 <p>
2211 M: modification of the contents or mode of a file
2212 </p>
2213 </li>
2214 <li>
2215 <p>
2216 R: renaming of a file
2217 </p>
2218 </li>
2219 <li>
2220 <p>
2221 T: change in the type of the file
2222 </p>
2223 </li>
2224 <li>
2225 <p>
2226 U: file is unmerged (you must complete the merge before it can
2227 be committed)
2228 </p>
2229 </li>
2230 <li>
2231 <p>
2233 </p>
2234 </li>
2235 </ul></div>
2237 percentage of similarity between the source and target of the move or
2238 copy), and are the only ones to be so.</p></div>
2239 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
2240 and it is out of sync with the index.</p></div>
2244 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
2245 </div></div>
2246 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
2247 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
2248 respectively.</p></div>
2249 </div>
2253 can take <em>-c</em> or <em>--cc</em> option
2254 to generate diff output also for merge commits. The output differs
2255 from the format described above in the following way:</p></div>
2257 <li>
2258 <p>
2259 there is a colon for each parent
2260 </p>
2261 </li>
2262 <li>
2263 <p>
2265 </p>
2266 </li>
2267 <li>
2268 <p>
2269 status is concatenated status characters for each parent
2270 </p>
2271 </li>
2272 <li>
2273 <p>
2275 </p>
2276 </li>
2277 <li>
2278 <p>
2280 </p>
2281 </li>
2282 </ol></div>
2286 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
2287 </div></div>
2288 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2289 all parents.</p></div>
2290 </div>
2296 do not produce the output described above; instead they produce a
2297 patch file. You can customize the creation of such patches via the
2298 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
2299 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2300 diff format:</p></div>
2302 <li>
2303 <p>
2305 </p>
2308 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2309 </div></div>
2310 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2311 involved. Especially, even for a creation or a deletion,
2312 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2313 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
2314 name of the source file of the rename/copy and the name of
2315 the file that rename/copy produces, respectively.</p></div>
2316 </li>
2317 <li>
2318 <p>
2319 It is followed by one or more extended header lines:
2320 </p>
2323 <pre><tt>old mode <mode>
2324 new mode <mode>
2325 deleted file mode <mode>
2326 new file mode <mode>
2327 copy from <path>
2328 copy to <path>
2329 rename from <path>
2330 rename to <path>
2331 similarity index <number>
2332 dissimilarity index <number>
2333 index <hash>..<hash> <mode></tt></pre>
2334 </div></div>
2335 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2336 and file permission bits.</p></div>
2337 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
2339 the dissimilarity index is the percentage of changed lines. It
2340 is a rounded down integer, followed by a percent sign. The
2341 similarity index value of 100% is thus reserved for two equal
2342 files, while 100% dissimilarity means that no line from the old
2343 file made it into the new one.</p></div>
2344 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
2345 The <mode> is included if the file mode does not change; otherwise,
2346 separate lines indicate the old and the new mode.</p></div>
2347 </li>
2348 <li>
2349 <p>
2350 TAB, LF, double quote and backslash characters in pathnames
2352 If there is need for such substitution then the whole
2353 pathname is put in double quotes.
2354 </p>
2355 </li>
2356 <li>
2357 <p>
2360 It is incorrect to apply each change to each file sequentially. For
2361 example, this patch will swap a and b:
2362 </p>
2365 <pre><tt>diff --git a/a b/b
2366 rename from a
2367 rename to b
2368 diff --git a/b b/a
2369 rename from b
2370 rename to a</tt></pre>
2371 </div></div>
2372 </li>
2373 </ol></div>
2374 </div>
2377 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
2380 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
2381 of these commands to force generation of diffs with individual parents
2382 of a merge.</p></div>
2386 <pre><tt>diff --combined describe.c
2387 index fabadb8,cc95eb0..4866510
2388 --- a/describe.c
2389 +++ b/describe.c
2392 }
2394 - static void describe(char *arg)
2395 -static void describe(struct commit *cmit, int last_one)
2396 ++static void describe(char *arg, int last_one)
2397 {
2398 + unsigned char sha1[20];
2399 + struct commit *cmit;
2400 struct commit_list *list;
2401 static int initialized = 0;
2402 struct commit_name *n;
2405 + usage(describe_usage);
2406 + cmit = lookup_commit_reference(sha1);
2407 + if (!cmit)
2408 + usage(describe_usage);
2409 +
2410 if (!initialized) {
2411 initialized = 1;
2412 for_each_ref(get_name);</tt></pre>
2413 </div></div>
2415 <li>
2416 <p>
2417 It is preceded with a "git diff" header, that looks like
2419 </p>
2423 </div></div>
2428 </div></div>
2429 </li>
2430 <li>
2431 <p>
2432 It is followed by one or more extended header lines
2433 (this example shows a merge with two parents):
2434 </p>
2441 </div></div>
2442 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
2444 information about detected contents movement (renames and
2445 copying detection) are designed to work with diff of two
2447 </li>
2448 <li>
2449 <p>
2450 It is followed by two-line from-file/to-file header
2451 </p>
2454 <pre><tt>--- a/file
2455 +++ b/file</tt></pre>
2456 </div></div>
2459 files.</p></div>
2460 </li>
2461 <li>
2462 <p>
2463 Chunk header format is modified to prevent people from
2465 was created for review of merge commit changes, and was not
2466 meant for apply. The change is similar to the change in the
2468 </p>
2471 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
2472 </div></div>
2474 header for combined diff format.</p></div>
2475 </li>
2476 </ol></div>
2478 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
2480 compares two or more files file1, file2,… with one file X, and
2481 shows how X differs from each of fileN. One column for each of
2482 fileN is prepended to the output line to note how X’s line is
2483 different from it.</p></div>
2484 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
2486 in the column N means that the line appears in the result,
2487 and fileN does not have that line (in other words, the line was
2488 added, from the point of view of that parent).</p></div>
2492 in either file1 nor file2). Also eight other lines are the same
2494 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
2495 merge commit with the merge result (i.e. file1..fileN are the
2497 two unresolved merge parents with the working tree file
2500 </div>
2503 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
2505 output. These options can be combined with other options, such as
2507 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
2508 formats the pathnames compactly by combining common prefix and suffix of
2514 </div></div>
2515 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
2517 like this:</p></div>
2522 </div></div>
2525 <li>
2526 <p>
2527 the number of added lines;
2528 </p>
2529 </li>
2530 <li>
2531 <p>
2532 a tab;
2533 </p>
2534 </li>
2535 <li>
2536 <p>
2537 the number of deleted lines;
2538 </p>
2539 </li>
2540 <li>
2541 <p>
2542 a tab;
2543 </p>
2544 </li>
2545 <li>
2546 <p>
2547 pathname (possibly with rename/copy information);
2548 </p>
2549 </li>
2550 <li>
2551 <p>
2552 a newline.
2553 </p>
2554 </li>
2555 </ol></div>
2556 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
2561 </div></div>
2564 <li>
2565 <p>
2566 the number of added lines;
2567 </p>
2568 </li>
2569 <li>
2570 <p>
2571 a tab;
2572 </p>
2573 </li>
2574 <li>
2575 <p>
2576 the number of deleted lines;
2577 </p>
2578 </li>
2579 <li>
2580 <p>
2581 a tab;
2582 </p>
2583 </li>
2584 <li>
2585 <p>
2586 a NUL (only exists if renamed/copied);
2587 </p>
2588 </li>
2589 <li>
2590 <p>
2591 pathname in preimage;
2592 </p>
2593 </li>
2594 <li>
2595 <p>
2596 a NUL (only exists if renamed/copied);
2597 </p>
2598 </li>
2599 <li>
2600 <p>
2601 pathname in postimage (only exists if renamed/copied);
2602 </p>
2603 </li>
2604 <li>
2605 <p>
2606 a NUL.
2607 </p>
2608 </li>
2609 </ol></div>
2610 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
2611 scripts that read the output to tell if the current record being read is
2612 a single-path record or a rename/copy record without reading ahead.
2615 </div>
2619 </div>
2620 </div>
2625 </div>
2626 </div>
2627 </body>
2628 </html>