| blob | 7a233bb9b8afbe02a2695cb896e775b8262f3066 |
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-files(1) Manual Page
574 </h1>
577 <p>git-diff-files -
578 Compares files in the working tree and the index
579 </p>
580 </div>
581 </div>
586 <div class="verseblock-content"><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</div>
588 </div></div>
589 </div>
593 are specified, compares only those named paths. Otherwise all
594 entries in the index are compared. The output format is the
596 </div>
601 -p
602 </dt>
604 -u
605 </dt>
607 --patch
608 </dt>
609 <dd>
610 <p>
611 Generate patch (see section on generating patches).
613 </p>
614 </dd>
617 </dt>
620 </dt>
621 <dd>
622 <p>
624 the usual three.
626 </p>
627 </dd>
629 --raw
630 </dt>
631 <dd>
632 <p>
633 Generate the raw format.
634 This is the default.
635 </p>
636 </dd>
638 --patch-with-raw
639 </dt>
640 <dd>
641 <p>
643 </p>
644 </dd>
646 --minimal
647 </dt>
648 <dd>
649 <p>
650 Spend extra time to make sure the smallest possible
651 diff is produced.
652 </p>
653 </dd>
655 --patience
656 </dt>
657 <dd>
658 <p>
659 Generate a diff using the "patience diff" algorithm.
660 </p>
661 </dd>
664 </dt>
665 <dd>
666 <p>
667 Generate a diffstat. You can override the default
669 The width of the filename part can be controlled by
670 giving another width to it separated by a comma.
674 </p>
675 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
676 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
677 </dd>
679 --numstat
680 </dt>
681 <dd>
682 <p>
684 deleted lines in decimal notation and pathname without
685 abbreviation, to make it more machine friendly. For
688 </p>
689 </dd>
691 --shortstat
692 </dt>
693 <dd>
694 <p>
696 number of modified files, as well as number of added and deleted
697 lines.
698 </p>
699 </dd>
702 </dt>
703 <dd>
704 <p>
705 Output the distribution of relative amount of changes for each
707 passing it a comma separated list of parameters.
710 The following parameters are available:
711 </p>
715 </dt>
716 <dd>
717 <p>
718 Compute the dirstat numbers by counting the lines that have been
719 removed from the source, or added to the destination. This ignores
720 the amount of pure code movements within a file. In other words,
721 rearranging lines in a file is not counted as much as other changes.
722 This is the default behavior when no parameter is given.
723 </p>
724 </dd>
727 </dt>
728 <dd>
729 <p>
730 Compute the dirstat numbers by doing the regular line-based diff
731 analysis, and summing the removed/added line counts. (For binary
732 files, count 64-byte chunks instead, since binary files have no
735 lines within a file as much as other changes. The resulting output
737 </p>
738 </dd>
741 </dt>
742 <dd>
743 <p>
744 Compute the dirstat numbers by counting the number of files changed.
745 Each changed file counts equally in the dirstat analysis. This is
747 not have to look at the file contents at all.
748 </p>
749 </dd>
752 </dt>
753 <dd>
754 <p>
755 Count changes in a child directory for the parent directory as well.
757 reported may exceed 100%. The default (non-cumulative) behavior can
759 </p>
760 </dd>
763 </dt>
764 <dd>
765 <p>
766 An integer parameter specifies a cut-off percent (3% by default).
767 Directories contributing less than this percentage of the changes
768 are not shown in the output.
769 </p>
770 </dd>
771 </dl></div>
773 directories with less than 10% of the total amount of changed files,
774 and accumulating child directory counts in the parent directories:
776 </dd>
778 --summary
779 </dt>
780 <dd>
781 <p>
782 Output a condensed summary of extended header information
783 such as creations, renames and mode changes.
784 </p>
785 </dd>
787 --patch-with-stat
788 </dt>
789 <dd>
790 <p>
792 </p>
793 </dd>
795 -z
796 </dt>
797 <dd>
798 <p>
799 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
800 given, do not munge pathnames and use NULs as output field terminators.
801 </p>
802 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
804 respectively, and the pathname will be enclosed in double quotes if
805 any of those replacements occurred.</p></div>
806 </dd>
808 --name-only
809 </dt>
810 <dd>
811 <p>
812 Show only names of changed files.
813 </p>
814 </dd>
816 --name-status
817 </dt>
818 <dd>
819 <p>
820 Show only names and status of changed files. See the description
821 of the <tt>--diff-filter</tt> option on what the status letters mean.
822 </p>
823 </dd>
825 --submodule[=<format>]
826 </dt>
827 <dd>
828 <p>
829 Chose the output format for submodule differences. <format> can be one of
830 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
831 is used when this option is not given. <em>log</em> is the default value for this
832 option and lists the commits in that commit range like the <em>summary</em>
834 </p>
835 </dd>
837 --color[=<when>]
838 </dt>
839 <dd>
840 <p>
841 Show colored diff.
842 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
843 The default value is <tt>never</tt>.
844 </p>
845 </dd>
847 --no-color
848 </dt>
849 <dd>
850 <p>
851 Turn off colored diff.
852 It is the same as <tt>--color=never</tt>.
853 </p>
854 </dd>
856 --word-diff[=<mode>]
857 </dt>
858 <dd>
859 <p>
860 Show a word diff, using the <mode> to delimit changed words.
861 By default, words are delimited by whitespace; see
862 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
863 must be one of:
864 </p>
867 color
868 </dt>
869 <dd>
870 <p>
871 Highlight changed words using only colors. Implies <tt>--color</tt>.
872 </p>
873 </dd>
875 plain
876 </dt>
877 <dd>
878 <p>
879 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
880 attempts to escape the delimiters if they appear in the input,
881 so the output may be ambiguous.
882 </p>
883 </dd>
885 porcelain
886 </dt>
887 <dd>
888 <p>
889 Use a special line-based format intended for script
890 consumption. Added/removed/unchanged runs are printed in the
891 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
892 character at the beginning of the line and extending to the
893 end of the line. Newlines in the input are represented by a
894 tilde <tt>~</tt> on a line of its own.
895 </p>
896 </dd>
898 none
899 </dt>
900 <dd>
901 <p>
902 Disable word diff again.
903 </p>
904 </dd>
905 </dl></div>
907 highlight the changed parts in all modes if enabled.</p></div>
908 </dd>
910 --word-diff-regex=<regex>
911 </dt>
912 <dd>
913 <p>
914 Use <regex> to decide what a word is, instead of considering
915 runs of non-whitespace to be a word. Also implies
916 <tt>--word-diff</tt> unless it was already enabled.
917 </p>
919 <regex> is considered a word. Anything between these matches is
920 considered whitespace and ignored(!) for the purposes of finding
921 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
922 expression to make sure that it matches all non-whitespace characters.
923 A match that contains a newline is silently truncated(!) at the
924 newline.</p></div>
925 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
926 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
927 overrides any diff driver or configuration setting. Diff drivers
928 override configuration settings.</p></div>
929 </dd>
931 --color-words[=<regex>]
932 </dt>
933 <dd>
934 <p>
935 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
936 specified) <tt>--word-diff-regex=<regex></tt>.
937 </p>
938 </dd>
940 --no-renames
941 </dt>
942 <dd>
943 <p>
944 Turn off rename detection, even when the configuration
945 file gives the default to do so.
946 </p>
947 </dd>
949 --check
950 </dt>
951 <dd>
952 <p>
953 Warn if changes introduce whitespace errors. What are
954 considered whitespace errors is controlled by <tt>core.whitespace</tt>
955 configuration. By default, trailing whitespaces (including
956 lines that solely consist of whitespaces) and a space character
957 that is immediately followed by a tab character inside the
958 initial indent of the line are considered whitespace errors.
959 Exits with non-zero status if problems are found. Not compatible
960 with --exit-code.
961 </p>
962 </dd>
964 --full-index
965 </dt>
966 <dd>
967 <p>
968 Instead of the first handful of characters, show the full
970 line when generating patch format output.
971 </p>
972 </dd>
974 --binary
975 </dt>
976 <dd>
977 <p>
978 In addition to <tt>--full-index</tt>, output a binary diff that
979 can be applied with <tt>git-apply</tt>.
980 </p>
981 </dd>
983 --abbrev[=<n>]
984 </dt>
985 <dd>
986 <p>
987 Instead of showing the full 40-byte hexadecimal object
988 name in diff-raw format output and diff-tree header
989 lines, show only a partial prefix. This is
990 independent of the <tt>--full-index</tt> option above, which controls
991 the diff-patch output format. Non default number of
992 digits can be specified with <tt>--abbrev=<n></tt>.
993 </p>
994 </dd>
996 -B[<n>][/<m>]
997 </dt>
999 --break-rewrites[=[<n>][/<m>]]
1000 </dt>
1001 <dd>
1002 <p>
1003 Break complete rewrite changes into pairs of delete and
1004 create. This serves two purposes:
1005 </p>
1006 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1007 not as a series of deletion and insertion mixed together with a very
1008 few lines that happen to match textually as the context, but as a
1009 single deletion of everything old followed by a single insertion of
1010 everything new, and the number <tt>m</tt> controls this aspect of the -B
1011 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
1012 original should remain in the result for git to consider it a total
1013 rewrite (i.e. otherwise the resulting patch will be a series of
1014 deletion and insertion mixed together with context lines).</p></div>
1015 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1016 source of a rename (usually -M only considers a file that disappeared
1017 as the source of a rename), and the number <tt>n</tt> controls this aspect of
1018 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
1019 addition and deletion compared to 20% or more of the file’s size are
1020 eligible for being picked up as a possible source of a rename to
1021 another file.</p></div>
1022 </dd>
1024 -M[<n>]
1025 </dt>
1027 --find-renames[=<n>]
1028 </dt>
1029 <dd>
1030 <p>
1031 Detect renames.
1032 If <tt>n</tt> is specified, it is a threshold on the similarity
1033 index (i.e. amount of addition/deletions compared to the
1034 file’s size). For example, <tt>-M90%</tt> means git should consider a
1035 delete/add pair to be a rename if more than 90% of the file
1036 hasn’t changed.
1037 </p>
1038 </dd>
1040 -C[<n>]
1041 </dt>
1043 --find-copies[=<n>]
1044 </dt>
1045 <dd>
1046 <p>
1047 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
1048 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
1049 </p>
1050 </dd>
1052 --find-copies-harder
1053 </dt>
1054 <dd>
1055 <p>
1056 For performance reasons, by default, <tt>-C</tt> option finds copies only
1057 if the original file of the copy was modified in the same
1058 changeset. This flag makes the command
1059 inspect unmodified files as candidates for the source of
1060 copy. This is a very expensive operation for large
1061 projects, so use it with caution. Giving more than one
1062 <tt>-C</tt> option has the same effect.
1063 </p>
1064 </dd>
1066 -D
1067 </dt>
1069 --irreversible-delete
1070 </dt>
1071 <dd>
1072 <p>
1073 Omit the preimage for deletes, i.e. print only the header but not
1074 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
1075 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
1076 solely for people who want to just concentrate on reviewing the
1077 text after the change. In addition, the output obviously lack
1078 enough information to apply such a patch in reverse, even manually,
1079 hence the name of the option.
1080 </p>
1081 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
1082 of a delete/create pair.</p></div>
1083 </dd>
1085 -l<num>
1086 </dt>
1087 <dd>
1088 <p>
1089 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
1090 is the number of potential rename/copy targets. This
1091 option prevents rename/copy detection from running if
1092 the number of rename/copy targets exceeds the specified
1093 number.
1094 </p>
1095 </dd>
1097 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1098 </dt>
1099 <dd>
1100 <p>
1101 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
1102 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
1103 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
1104 are Unmerged (<tt>U</tt>), are
1105 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
1106 Any combination of the filter characters (including none) can be used.
1107 When <tt>*</tt> (All-or-none) is added to the combination, all
1108 paths are selected if there is any file that matches
1109 other criteria in the comparison; if there is no file
1110 that matches other criteria, nothing is selected.
1111 </p>
1112 </dd>
1114 -S<string>
1115 </dt>
1116 <dd>
1117 <p>
1118 Look for differences that introduce or remove an instance of
1119 <string>. Note that this is different than the string simply
1120 appearing in diff output; see the <em>pickaxe</em> entry in
1122 </p>
1123 </dd>
1125 -G<regex>
1126 </dt>
1127 <dd>
1128 <p>
1129 Look for differences whose added or removed line matches
1130 the given <regex>.
1131 </p>
1132 </dd>
1134 --pickaxe-all
1135 </dt>
1136 <dd>
1137 <p>
1138 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
1139 changeset, not just the files that contain the change
1140 in <string>.
1141 </p>
1142 </dd>
1144 --pickaxe-regex
1145 </dt>
1146 <dd>
1147 <p>
1148 Make the <string> not a plain string but an extended POSIX
1149 regex to match.
1150 </p>
1151 </dd>
1153 -O<orderfile>
1154 </dt>
1155 <dd>
1156 <p>
1157 Output the patch in the order specified in the
1158 <orderfile>, which has one shell glob pattern per line.
1159 </p>
1160 </dd>
1162 -R
1163 </dt>
1164 <dd>
1165 <p>
1166 Swap two inputs; that is, show differences from index or
1167 on-disk file to tree contents.
1168 </p>
1169 </dd>
1171 --relative[=<path>]
1172 </dt>
1173 <dd>
1174 <p>
1175 When run from a subdirectory of the project, it can be
1176 told to exclude changes outside the directory and show
1177 pathnames relative to it with this option. When you are
1178 not in a subdirectory (e.g. in a bare repository), you
1179 can name which subdirectory to make the output relative
1180 to by giving a <path> as an argument.
1181 </p>
1182 </dd>
1184 -a
1185 </dt>
1187 --text
1188 </dt>
1189 <dd>
1190 <p>
1191 Treat all files as text.
1192 </p>
1193 </dd>
1195 --ignore-space-at-eol
1196 </dt>
1197 <dd>
1198 <p>
1199 Ignore changes in whitespace at EOL.
1200 </p>
1201 </dd>
1203 -b
1204 </dt>
1206 --ignore-space-change
1207 </dt>
1208 <dd>
1209 <p>
1210 Ignore changes in amount of whitespace. This ignores whitespace
1211 at line end, and considers all other sequences of one or
1212 more whitespace characters to be equivalent.
1213 </p>
1214 </dd>
1216 -w
1217 </dt>
1219 --ignore-all-space
1220 </dt>
1221 <dd>
1222 <p>
1223 Ignore whitespace when comparing lines. This ignores
1224 differences even if one line has whitespace where the other
1225 line has none.
1226 </p>
1227 </dd>
1229 --inter-hunk-context=<lines>
1230 </dt>
1231 <dd>
1232 <p>
1233 Show the context between diff hunks, up to the specified number
1234 of lines, thereby fusing hunks that are close to each other.
1235 </p>
1236 </dd>
1238 --exit-code
1239 </dt>
1240 <dd>
1241 <p>
1242 Make the program exit with codes similar to diff(1).
1243 That is, it exits with 1 if there were differences and
1244 0 means no differences.
1245 </p>
1246 </dd>
1248 --quiet
1249 </dt>
1250 <dd>
1251 <p>
1252 Disable all output of the program. Implies <tt>--exit-code</tt>.
1253 </p>
1254 </dd>
1256 --ext-diff
1257 </dt>
1258 <dd>
1259 <p>
1260 Allow an external diff helper to be executed. If you set an
1263 </p>
1264 </dd>
1266 --no-ext-diff
1267 </dt>
1268 <dd>
1269 <p>
1270 Disallow external diff drivers.
1271 </p>
1272 </dd>
1274 --textconv
1275 </dt>
1277 --no-textconv
1278 </dt>
1279 <dd>
1280 <p>
1281 Allow (or disallow) external text conversion filters to be run
1283 details. Because textconv filters are typically a one-way
1284 conversion, the resulting diff is suitable for human
1285 consumption, but cannot be applied. For this reason, textconv
1287 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1288 diff plumbing commands.
1289 </p>
1290 </dd>
1292 --ignore-submodules[=<when>]
1293 </dt>
1294 <dd>
1295 <p>
1296 Ignore changes to submodules in the diff generation. <when> can be
1299 untracked or modified files or its HEAD differs from the commit recorded
1300 in the superproject and can be used to override any settings of the
1301 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1303 contain untracked content (but they are still scanned for modified
1305 only changes to the commits stored in the superproject are shown (this was
1307 </p>
1308 </dd>
1310 --src-prefix=<prefix>
1311 </dt>
1312 <dd>
1313 <p>
1315 </p>
1316 </dd>
1318 --dst-prefix=<prefix>
1319 </dt>
1320 <dd>
1321 <p>
1323 </p>
1324 </dd>
1326 --no-prefix
1327 </dt>
1328 <dd>
1329 <p>
1330 Do not show any source or destination prefix.
1331 </p>
1332 </dd>
1333 </dl></div>
1338 -1 --base
1339 </dt>
1341 -2 --ours
1342 </dt>
1344 -3 --theirs
1345 </dt>
1347 -0
1348 </dt>
1349 <dd>
1350 <p>
1352 branch" respectively. With these options, diffs for
1353 merged entries are not shown.
1354 </p>
1356 cleanly resolved paths. The option -0 can be given to
1358 </dd>
1360 -c
1361 </dt>
1363 --cc
1364 </dt>
1365 <dd>
1366 <p>
1367 This compares stage 2 (our branch), stage 3 (their
1368 branch) and the working tree file and outputs a combined
1369 diff, similar to the way <em>diff-tree</em> shows a merge
1370 commit with these flags.
1371 </p>
1372 </dd>
1374 -q
1375 </dt>
1376 <dd>
1377 <p>
1378 Remain silent even on nonexistent files
1379 </p>
1380 </dd>
1381 </dl></div>
1382 </div>
1388 compared differs:</p></div>
1391 git-diff-index <tree-ish>
1392 </dt>
1393 <dd>
1394 <p>
1395 compares the <tree-ish> and the files on the filesystem.
1396 </p>
1397 </dd>
1399 git-diff-index --cached <tree-ish>
1400 </dt>
1401 <dd>
1402 <p>
1403 compares the <tree-ish> and the index.
1404 </p>
1405 </dd>
1407 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1408 </dt>
1409 <dd>
1410 <p>
1411 compares the trees named by the two arguments.
1412 </p>
1413 </dd>
1415 git-diff-files [<pattern>…]
1416 </dt>
1417 <dd>
1418 <p>
1419 compares the index and the files on the filesystem.
1420 </p>
1421 </dd>
1422 </dl></div>
1423 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1424 what is being compared. After that, all the commands print one output
1425 line per changed file.</p></div>
1429 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1430 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1431 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1432 create :000000 100644 0000000... 1234567... A file4
1433 delete :100644 000000 1234567... 0000000... D file5
1434 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1435 </div></div>
1438 <li>
1439 <p>
1440 a colon.
1441 </p>
1442 </li>
1443 <li>
1444 <p>
1446 </p>
1447 </li>
1448 <li>
1449 <p>
1450 a space.
1451 </p>
1452 </li>
1453 <li>
1454 <p>
1456 </p>
1457 </li>
1458 <li>
1459 <p>
1460 a space.
1461 </p>
1462 </li>
1463 <li>
1464 <p>
1466 </p>
1467 </li>
1468 <li>
1469 <p>
1470 a space.
1471 </p>
1472 </li>
1473 <li>
1474 <p>
1476 </p>
1477 </li>
1478 <li>
1479 <p>
1480 a space.
1481 </p>
1482 </li>
1483 <li>
1484 <p>
1486 </p>
1487 </li>
1488 <li>
1489 <p>
1490 a tab or a NUL when <em>-z</em> option is used.
1491 </p>
1492 </li>
1493 <li>
1494 <p>
1496 </p>
1497 </li>
1498 <li>
1499 <p>
1500 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1501 </p>
1502 </li>
1503 <li>
1504 <p>
1506 </p>
1507 </li>
1508 <li>
1509 <p>
1510 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1511 </p>
1512 </li>
1513 </ol></div>
1516 <li>
1517 <p>
1518 A: addition of a file
1519 </p>
1520 </li>
1521 <li>
1522 <p>
1523 C: copy of a file into a new one
1524 </p>
1525 </li>
1526 <li>
1527 <p>
1528 D: deletion of a file
1529 </p>
1530 </li>
1531 <li>
1532 <p>
1533 M: modification of the contents or mode of a file
1534 </p>
1535 </li>
1536 <li>
1537 <p>
1538 R: renaming of a file
1539 </p>
1540 </li>
1541 <li>
1542 <p>
1543 T: change in the type of the file
1544 </p>
1545 </li>
1546 <li>
1547 <p>
1548 U: file is unmerged (you must complete the merge before it can
1549 be committed)
1550 </p>
1551 </li>
1552 <li>
1553 <p>
1555 </p>
1556 </li>
1557 </ul></div>
1559 percentage of similarity between the source and target of the move or
1560 copy), and are the only ones to be so.</p></div>
1561 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1562 and it is out of sync with the index.</p></div>
1566 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1567 </div></div>
1568 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1569 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1570 respectively.</p></div>
1571 </div>
1575 can take <em>-c</em> or <em>--cc</em> option
1576 to generate diff output also for merge commits. The output differs
1577 from the format described above in the following way:</p></div>
1579 <li>
1580 <p>
1581 there is a colon for each parent
1582 </p>
1583 </li>
1584 <li>
1585 <p>
1587 </p>
1588 </li>
1589 <li>
1590 <p>
1591 status is concatenated status characters for each parent
1592 </p>
1593 </li>
1594 <li>
1595 <p>
1597 </p>
1598 </li>
1599 <li>
1600 <p>
1602 </p>
1603 </li>
1604 </ol></div>
1608 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1609 </div></div>
1610 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1611 all parents.</p></div>
1612 </div>
1618 do not produce the output described above; instead they produce a
1619 patch file. You can customize the creation of such patches via the
1620 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1621 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1622 diff format:</p></div>
1624 <li>
1625 <p>
1627 </p>
1630 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1631 </div></div>
1632 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1633 involved. Especially, even for a creation or a deletion,
1634 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1635 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1636 name of the source file of the rename/copy and the name of
1637 the file that rename/copy produces, respectively.</p></div>
1638 </li>
1639 <li>
1640 <p>
1641 It is followed by one or more extended header lines:
1642 </p>
1645 <pre><tt>old mode <mode>
1646 new mode <mode>
1647 deleted file mode <mode>
1648 new file mode <mode>
1649 copy from <path>
1650 copy to <path>
1651 rename from <path>
1652 rename to <path>
1653 similarity index <number>
1654 dissimilarity index <number>
1655 index <hash>..<hash> <mode></tt></pre>
1656 </div></div>
1657 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1658 and file permission bits.</p></div>
1659 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1661 the dissimilarity index is the percentage of changed lines. It
1662 is a rounded down integer, followed by a percent sign. The
1663 similarity index value of 100% is thus reserved for two equal
1664 files, while 100% dissimilarity means that no line from the old
1665 file made it into the new one.</p></div>
1666 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1667 The <mode> is included if the file mode does not change; otherwise,
1668 separate lines indicate the old and the new mode.</p></div>
1669 </li>
1670 <li>
1671 <p>
1672 TAB, LF, double quote and backslash characters in pathnames
1674 If there is need for such substitution then the whole
1675 pathname is put in double quotes.
1676 </p>
1677 </li>
1678 <li>
1679 <p>
1682 It is incorrect to apply each change to each file sequentially. For
1683 example, this patch will swap a and b:
1684 </p>
1687 <pre><tt>diff --git a/a b/b
1688 rename from a
1689 rename to b
1690 diff --git a/b b/a
1691 rename from b
1692 rename to a</tt></pre>
1693 </div></div>
1694 </li>
1695 </ol></div>
1696 </div>
1699 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1702 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1703 of these commands to force generation of diffs with individual parents
1704 of a merge.</p></div>
1708 <pre><tt>diff --combined describe.c
1709 index fabadb8,cc95eb0..4866510
1710 --- a/describe.c
1711 +++ b/describe.c
1714 }
1716 - static void describe(char *arg)
1717 -static void describe(struct commit *cmit, int last_one)
1718 ++static void describe(char *arg, int last_one)
1719 {
1720 + unsigned char sha1[20];
1721 + struct commit *cmit;
1722 struct commit_list *list;
1723 static int initialized = 0;
1724 struct commit_name *n;
1727 + usage(describe_usage);
1728 + cmit = lookup_commit_reference(sha1);
1729 + if (!cmit)
1730 + usage(describe_usage);
1731 +
1732 if (!initialized) {
1733 initialized = 1;
1734 for_each_ref(get_name);</tt></pre>
1735 </div></div>
1737 <li>
1738 <p>
1739 It is preceded with a "git diff" header, that looks like
1741 </p>
1745 </div></div>
1750 </div></div>
1751 </li>
1752 <li>
1753 <p>
1754 It is followed by one or more extended header lines
1755 (this example shows a merge with two parents):
1756 </p>
1763 </div></div>
1764 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1766 information about detected contents movement (renames and
1767 copying detection) are designed to work with diff of two
1769 </li>
1770 <li>
1771 <p>
1772 It is followed by two-line from-file/to-file header
1773 </p>
1776 <pre><tt>--- a/file
1777 +++ b/file</tt></pre>
1778 </div></div>
1781 files.</p></div>
1782 </li>
1783 <li>
1784 <p>
1785 Chunk header format is modified to prevent people from
1787 was created for review of merge commit changes, and was not
1788 meant for apply. The change is similar to the change in the
1790 </p>
1793 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1794 </div></div>
1796 header for combined diff format.</p></div>
1797 </li>
1798 </ol></div>
1800 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
1802 compares two or more files file1, file2,… with one file X, and
1803 shows how X differs from each of fileN. One column for each of
1804 fileN is prepended to the output line to note how X’s line is
1805 different from it.</p></div>
1806 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1808 in the column N means that the line appears in the result,
1809 and fileN does not have that line (in other words, the line was
1810 added, from the point of view of that parent).</p></div>
1814 in either file1 nor file2). Also eight other lines are the same
1816 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1817 merge commit with the merge result (i.e. file1..fileN are the
1819 two unresolved merge parents with the working tree file
1822 </div>
1825 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1827 output. These options can be combined with other options, such as
1829 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1830 formats the pathnames compactly by combining common prefix and suffix of
1836 </div></div>
1837 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1839 like this:</p></div>
1844 </div></div>
1847 <li>
1848 <p>
1849 the number of added lines;
1850 </p>
1851 </li>
1852 <li>
1853 <p>
1854 a tab;
1855 </p>
1856 </li>
1857 <li>
1858 <p>
1859 the number of deleted lines;
1860 </p>
1861 </li>
1862 <li>
1863 <p>
1864 a tab;
1865 </p>
1866 </li>
1867 <li>
1868 <p>
1869 pathname (possibly with rename/copy information);
1870 </p>
1871 </li>
1872 <li>
1873 <p>
1874 a newline.
1875 </p>
1876 </li>
1877 </ol></div>
1878 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1883 </div></div>
1886 <li>
1887 <p>
1888 the number of added lines;
1889 </p>
1890 </li>
1891 <li>
1892 <p>
1893 a tab;
1894 </p>
1895 </li>
1896 <li>
1897 <p>
1898 the number of deleted lines;
1899 </p>
1900 </li>
1901 <li>
1902 <p>
1903 a tab;
1904 </p>
1905 </li>
1906 <li>
1907 <p>
1908 a NUL (only exists if renamed/copied);
1909 </p>
1910 </li>
1911 <li>
1912 <p>
1913 pathname in preimage;
1914 </p>
1915 </li>
1916 <li>
1917 <p>
1918 a NUL (only exists if renamed/copied);
1919 </p>
1920 </li>
1921 <li>
1922 <p>
1923 pathname in postimage (only exists if renamed/copied);
1924 </p>
1925 </li>
1926 <li>
1927 <p>
1928 a NUL.
1929 </p>
1930 </li>
1931 </ol></div>
1932 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1933 scripts that read the output to tell if the current record being read is
1934 a single-path record or a rename/copy record without reading ahead.
1937 </div>
1941 </div>
1942 </div>
1947 </div>
1948 </div>
1949 </body>
1950 </html>