| blob | 06304427b7f633287570eb8b837dea6e464dc57b |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-diff-files(1) Manual Page
407 </h1>
410 <p>git-diff-files -
411 Compares files in the working tree and the index
412 </p>
413 </div>
414 </div>
417 <div class="paragraph"><p><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</p></div>
418 </div>
422 are specified, compares only those named paths. Otherwise all
423 entries in the index are compared. The output format is the
425 </div>
430 -p
431 </dt>
433 -u
434 </dt>
436 --patch
437 </dt>
438 <dd>
439 <p>
440 Generate patch (see section on generating patches).
442 </p>
443 </dd>
446 </dt>
449 </dt>
450 <dd>
451 <p>
453 the usual three.
455 </p>
456 </dd>
458 --raw
459 </dt>
460 <dd>
461 <p>
462 Generate the raw format.
463 This is the default.
464 </p>
465 </dd>
467 --patch-with-raw
468 </dt>
469 <dd>
470 <p>
472 </p>
473 </dd>
475 --patience
476 </dt>
477 <dd>
478 <p>
479 Generate a diff using the "patience diff" algorithm.
480 </p>
481 </dd>
484 </dt>
485 <dd>
486 <p>
487 Generate a diffstat. You can override the default
489 The width of the filename part can be controlled by
490 giving another width to it separated by a comma.
491 </p>
492 </dd>
494 --numstat
495 </dt>
496 <dd>
497 <p>
499 deleted lines in decimal notation and pathname without
500 abbreviation, to make it more machine friendly. For
503 </p>
504 </dd>
506 --shortstat
507 </dt>
508 <dd>
509 <p>
511 number of modified files, as well as number of added and deleted
512 lines.
513 </p>
514 </dd>
517 </dt>
518 <dd>
519 <p>
520 Output the distribution of relative amount of changes for each
522 passing it a comma separated list of parameters.
525 The following parameters are available:
526 </p>
530 </dt>
531 <dd>
532 <p>
533 Compute the dirstat numbers by counting the lines that have been
534 removed from the source, or added to the destination. This ignores
535 the amount of pure code movements within a file. In other words,
536 rearranging lines in a file is not counted as much as other changes.
537 This is the default behavior when no parameter is given.
538 </p>
539 </dd>
542 </dt>
543 <dd>
544 <p>
545 Compute the dirstat numbers by doing the regular line-based diff
546 analysis, and summing the removed/added line counts. (For binary
547 files, count 64-byte chunks instead, since binary files have no
550 lines within a file as much as other changes. The resulting output
552 </p>
553 </dd>
556 </dt>
557 <dd>
558 <p>
559 Compute the dirstat numbers by counting the number of files changed.
560 Each changed file counts equally in the dirstat analysis. This is
562 not have to look at the file contents at all.
563 </p>
564 </dd>
567 </dt>
568 <dd>
569 <p>
570 Count changes in a child directory for the parent directory as well.
572 reported may exceed 100%. The default (non-cumulative) behavior can
574 </p>
575 </dd>
578 </dt>
579 <dd>
580 <p>
581 An integer parameter specifies a cut-off percent (3% by default).
582 Directories contributing less than this percentage of the changes
583 are not shown in the output.
584 </p>
585 </dd>
586 </dl></div>
588 directories with less than 10% of the total amount of changed files,
589 and accumulating child directory counts in the parent directories:
591 </dd>
593 --summary
594 </dt>
595 <dd>
596 <p>
597 Output a condensed summary of extended header information
598 such as creations, renames and mode changes.
599 </p>
600 </dd>
602 --patch-with-stat
603 </dt>
604 <dd>
605 <p>
607 </p>
608 </dd>
610 -z
611 </dt>
612 <dd>
613 <p>
614 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
615 given, do not munge pathnames and use NULs as output field terminators.
616 </p>
617 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
619 respectively, and the pathname will be enclosed in double quotes if
620 any of those replacements occurred.</p></div>
621 </dd>
623 --name-only
624 </dt>
625 <dd>
626 <p>
627 Show only names of changed files.
628 </p>
629 </dd>
631 --name-status
632 </dt>
633 <dd>
634 <p>
635 Show only names and status of changed files. See the description
636 of the <tt>--diff-filter</tt> option on what the status letters mean.
637 </p>
638 </dd>
640 --submodule[=<format>]
641 </dt>
642 <dd>
643 <p>
644 Chose the output format for submodule differences. <format> can be one of
645 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
646 is used when this option is not given. <em>log</em> is the default value for this
647 option and lists the commits in that commit range like the <em>summary</em>
649 </p>
650 </dd>
652 --color[=<when>]
653 </dt>
654 <dd>
655 <p>
656 Show colored diff.
657 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
658 The default value is <tt>never</tt>.
659 </p>
660 </dd>
662 --no-color
663 </dt>
664 <dd>
665 <p>
666 Turn off colored diff.
667 It is the same as <tt>--color=never</tt>.
668 </p>
669 </dd>
671 --word-diff[=<mode>]
672 </dt>
673 <dd>
674 <p>
675 Show a word diff, using the <mode> to delimit changed words.
676 By default, words are delimited by whitespace; see
677 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
678 must be one of:
679 </p>
682 color
683 </dt>
684 <dd>
685 <p>
686 Highlight changed words using only colors. Implies <tt>--color</tt>.
687 </p>
688 </dd>
690 plain
691 </dt>
692 <dd>
693 <p>
694 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
695 attempts to escape the delimiters if they appear in the input,
696 so the output may be ambiguous.
697 </p>
698 </dd>
700 porcelain
701 </dt>
702 <dd>
703 <p>
704 Use a special line-based format intended for script
705 consumption. Added/removed/unchanged runs are printed in the
706 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
707 character at the beginning of the line and extending to the
708 end of the line. Newlines in the input are represented by a
709 tilde <tt>~</tt> on a line of its own.
710 </p>
711 </dd>
713 none
714 </dt>
715 <dd>
716 <p>
717 Disable word diff again.
718 </p>
719 </dd>
720 </dl></div>
722 highlight the changed parts in all modes if enabled.</p></div>
723 </dd>
725 --word-diff-regex=<regex>
726 </dt>
727 <dd>
728 <p>
729 Use <regex> to decide what a word is, instead of considering
730 runs of non-whitespace to be a word. Also implies
731 <tt>--word-diff</tt> unless it was already enabled.
732 </p>
734 <regex> is considered a word. Anything between these matches is
735 considered whitespace and ignored(!) for the purposes of finding
736 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
737 expression to make sure that it matches all non-whitespace characters.
738 A match that contains a newline is silently truncated(!) at the
739 newline.</p></div>
740 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
741 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
742 overrides any diff driver or configuration setting. Diff drivers
743 override configuration settings.</p></div>
744 </dd>
746 --color-words[=<regex>]
747 </dt>
748 <dd>
749 <p>
750 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
751 specified) <tt>--word-diff-regex=<regex></tt>.
752 </p>
753 </dd>
755 --no-renames
756 </dt>
757 <dd>
758 <p>
759 Turn off rename detection, even when the configuration
760 file gives the default to do so.
761 </p>
762 </dd>
764 --check
765 </dt>
766 <dd>
767 <p>
768 Warn if changes introduce whitespace errors. What are
769 considered whitespace errors is controlled by <tt>core.whitespace</tt>
770 configuration. By default, trailing whitespaces (including
771 lines that solely consist of whitespaces) and a space character
772 that is immediately followed by a tab character inside the
773 initial indent of the line are considered whitespace errors.
774 Exits with non-zero status if problems are found. Not compatible
775 with --exit-code.
776 </p>
777 </dd>
779 --full-index
780 </dt>
781 <dd>
782 <p>
783 Instead of the first handful of characters, show the full
785 line when generating patch format output.
786 </p>
787 </dd>
789 --binary
790 </dt>
791 <dd>
792 <p>
793 In addition to <tt>--full-index</tt>, output a binary diff that
794 can be applied with <tt>git-apply</tt>.
795 </p>
796 </dd>
798 --abbrev[=<n>]
799 </dt>
800 <dd>
801 <p>
802 Instead of showing the full 40-byte hexadecimal object
803 name in diff-raw format output and diff-tree header
804 lines, show only a partial prefix. This is
805 independent of the <tt>--full-index</tt> option above, which controls
806 the diff-patch output format. Non default number of
807 digits can be specified with <tt>--abbrev=<n></tt>.
808 </p>
809 </dd>
811 -B[<n>][/<m>]
812 </dt>
814 --break-rewrites[=[<n>][/<m>]]
815 </dt>
816 <dd>
817 <p>
818 Break complete rewrite changes into pairs of delete and
819 create. This serves two purposes:
820 </p>
822 not as a series of deletion and insertion mixed together with a very
823 few lines that happen to match textually as the context, but as a
824 single deletion of everything old followed by a single insertion of
825 everything new, and the number <tt>m</tt> controls this aspect of the -B
826 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
827 original should remain in the result for git to consider it a total
828 rewrite (i.e. otherwise the resulting patch will be a series of
829 deletion and insertion mixed together with context lines).</p></div>
831 source of a rename (usually -M only considers a file that disappeared
832 as the source of a rename), and the number <tt>n</tt> controls this aspect of
833 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
834 addition and deletion compared to 20% or more of the file’s size are
835 eligible for being picked up as a possible source of a rename to
836 another file.</p></div>
837 </dd>
839 -M[<n>]
840 </dt>
842 --find-renames[=<n>]
843 </dt>
844 <dd>
845 <p>
846 Detect renames.
847 If <tt>n</tt> is specified, it is a threshold on the similarity
848 index (i.e. amount of addition/deletions compared to the
849 file’s size). For example, <tt>-M90%</tt> means git should consider a
850 delete/add pair to be a rename if more than 90% of the file
851 hasn’t changed.
852 </p>
853 </dd>
855 -C[<n>]
856 </dt>
858 --find-copies[=<n>]
859 </dt>
860 <dd>
861 <p>
862 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
863 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
864 </p>
865 </dd>
867 --find-copies-harder
868 </dt>
869 <dd>
870 <p>
871 For performance reasons, by default, <tt>-C</tt> option finds copies only
872 if the original file of the copy was modified in the same
873 changeset. This flag makes the command
874 inspect unmodified files as candidates for the source of
875 copy. This is a very expensive operation for large
876 projects, so use it with caution. Giving more than one
877 <tt>-C</tt> option has the same effect.
878 </p>
879 </dd>
881 -D
882 </dt>
884 --irreversible-delete
885 </dt>
886 <dd>
887 <p>
888 Omit the preimage for deletes, i.e. print only the header but not
889 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
890 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
891 solely for people who want to just concentrate on reviewing the
892 text after the change. In addition, the output obviously lack
893 enough information to apply such a patch in reverse, even manually,
894 hence the name of the option.
895 </p>
896 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
897 of a delete/create pair.</p></div>
898 </dd>
900 -l<num>
901 </dt>
902 <dd>
903 <p>
904 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
905 is the number of potential rename/copy targets. This
906 option prevents rename/copy detection from running if
907 the number of rename/copy targets exceeds the specified
908 number.
909 </p>
910 </dd>
912 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
913 </dt>
914 <dd>
915 <p>
916 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
917 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
918 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
919 are Unmerged (<tt>U</tt>), are
920 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
921 Any combination of the filter characters (including none) can be used.
922 When <tt>*</tt> (All-or-none) is added to the combination, all
923 paths are selected if there is any file that matches
924 other criteria in the comparison; if there is no file
925 that matches other criteria, nothing is selected.
926 </p>
927 </dd>
929 -S<string>
930 </dt>
931 <dd>
932 <p>
933 Look for differences that introduce or remove an instance of
934 <string>. Note that this is different than the string simply
935 appearing in diff output; see the <em>pickaxe</em> entry in
937 </p>
938 </dd>
940 -G<regex>
941 </dt>
942 <dd>
943 <p>
944 Look for differences whose added or removed line matches
945 the given <regex>.
946 </p>
947 </dd>
949 --pickaxe-all
950 </dt>
951 <dd>
952 <p>
953 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
954 changeset, not just the files that contain the change
955 in <string>.
956 </p>
957 </dd>
959 --pickaxe-regex
960 </dt>
961 <dd>
962 <p>
963 Make the <string> not a plain string but an extended POSIX
964 regex to match.
965 </p>
966 </dd>
968 -O<orderfile>
969 </dt>
970 <dd>
971 <p>
972 Output the patch in the order specified in the
973 <orderfile>, which has one shell glob pattern per line.
974 </p>
975 </dd>
977 -R
978 </dt>
979 <dd>
980 <p>
981 Swap two inputs; that is, show differences from index or
982 on-disk file to tree contents.
983 </p>
984 </dd>
986 --relative[=<path>]
987 </dt>
988 <dd>
989 <p>
990 When run from a subdirectory of the project, it can be
991 told to exclude changes outside the directory and show
992 pathnames relative to it with this option. When you are
993 not in a subdirectory (e.g. in a bare repository), you
994 can name which subdirectory to make the output relative
995 to by giving a <path> as an argument.
996 </p>
997 </dd>
999 -a
1000 </dt>
1002 --text
1003 </dt>
1004 <dd>
1005 <p>
1006 Treat all files as text.
1007 </p>
1008 </dd>
1010 --ignore-space-at-eol
1011 </dt>
1012 <dd>
1013 <p>
1014 Ignore changes in whitespace at EOL.
1015 </p>
1016 </dd>
1018 -b
1019 </dt>
1021 --ignore-space-change
1022 </dt>
1023 <dd>
1024 <p>
1025 Ignore changes in amount of whitespace. This ignores whitespace
1026 at line end, and considers all other sequences of one or
1027 more whitespace characters to be equivalent.
1028 </p>
1029 </dd>
1031 -w
1032 </dt>
1034 --ignore-all-space
1035 </dt>
1036 <dd>
1037 <p>
1038 Ignore whitespace when comparing lines. This ignores
1039 differences even if one line has whitespace where the other
1040 line has none.
1041 </p>
1042 </dd>
1044 --inter-hunk-context=<lines>
1045 </dt>
1046 <dd>
1047 <p>
1048 Show the context between diff hunks, up to the specified number
1049 of lines, thereby fusing hunks that are close to each other.
1050 </p>
1051 </dd>
1053 --exit-code
1054 </dt>
1055 <dd>
1056 <p>
1057 Make the program exit with codes similar to diff(1).
1058 That is, it exits with 1 if there were differences and
1059 0 means no differences.
1060 </p>
1061 </dd>
1063 --quiet
1064 </dt>
1065 <dd>
1066 <p>
1067 Disable all output of the program. Implies <tt>--exit-code</tt>.
1068 </p>
1069 </dd>
1071 --ext-diff
1072 </dt>
1073 <dd>
1074 <p>
1075 Allow an external diff helper to be executed. If you set an
1078 </p>
1079 </dd>
1081 --no-ext-diff
1082 </dt>
1083 <dd>
1084 <p>
1085 Disallow external diff drivers.
1086 </p>
1087 </dd>
1089 --ignore-submodules[=<when>]
1090 </dt>
1091 <dd>
1092 <p>
1093 Ignore changes to submodules in the diff generation. <when> can be
1096 untracked or modified files or its HEAD differs from the commit recorded
1097 in the superproject and can be used to override any settings of the
1098 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1100 contain untracked content (but they are still scanned for modified
1102 only changes to the commits stored in the superproject are shown (this was
1104 </p>
1105 </dd>
1107 --src-prefix=<prefix>
1108 </dt>
1109 <dd>
1110 <p>
1112 </p>
1113 </dd>
1115 --dst-prefix=<prefix>
1116 </dt>
1117 <dd>
1118 <p>
1120 </p>
1121 </dd>
1123 --no-prefix
1124 </dt>
1125 <dd>
1126 <p>
1127 Do not show any source or destination prefix.
1128 </p>
1129 </dd>
1130 </dl></div>
1135 -1 --base
1136 </dt>
1138 -2 --ours
1139 </dt>
1141 -3 --theirs
1142 </dt>
1144 -0
1145 </dt>
1146 <dd>
1147 <p>
1149 branch" respectively. With these options, diffs for
1150 merged entries are not shown.
1151 </p>
1153 cleanly resolved paths. The option -0 can be given to
1155 </dd>
1157 -c
1158 </dt>
1160 --cc
1161 </dt>
1162 <dd>
1163 <p>
1164 This compares stage 2 (our branch), stage 3 (their
1165 branch) and the working tree file and outputs a combined
1166 diff, similar to the way <em>diff-tree</em> shows a merge
1167 commit with these flags.
1168 </p>
1169 </dd>
1171 -q
1172 </dt>
1173 <dd>
1174 <p>
1175 Remain silent even on nonexistent files
1176 </p>
1177 </dd>
1178 </dl></div>
1179 </div>
1185 compared differs:</p></div>
1188 git-diff-index <tree-ish>
1189 </dt>
1190 <dd>
1191 <p>
1192 compares the <tree-ish> and the files on the filesystem.
1193 </p>
1194 </dd>
1196 git-diff-index --cached <tree-ish>
1197 </dt>
1198 <dd>
1199 <p>
1200 compares the <tree-ish> and the index.
1201 </p>
1202 </dd>
1204 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1205 </dt>
1206 <dd>
1207 <p>
1208 compares the trees named by the two arguments.
1209 </p>
1210 </dd>
1212 git-diff-files [<pattern>…]
1213 </dt>
1214 <dd>
1215 <p>
1216 compares the index and the files on the filesystem.
1217 </p>
1218 </dd>
1219 </dl></div>
1220 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1221 what is being compared. After that, all the commands print one output
1222 line per changed file.</p></div>
1226 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1227 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1228 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1229 create :000000 100644 0000000... 1234567... A file4
1230 delete :100644 000000 1234567... 0000000... D file5
1231 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1232 </div></div>
1235 <li>
1236 <p>
1237 a colon.
1238 </p>
1239 </li>
1240 <li>
1241 <p>
1243 </p>
1244 </li>
1245 <li>
1246 <p>
1247 a space.
1248 </p>
1249 </li>
1250 <li>
1251 <p>
1253 </p>
1254 </li>
1255 <li>
1256 <p>
1257 a space.
1258 </p>
1259 </li>
1260 <li>
1261 <p>
1263 </p>
1264 </li>
1265 <li>
1266 <p>
1267 a space.
1268 </p>
1269 </li>
1270 <li>
1271 <p>
1273 </p>
1274 </li>
1275 <li>
1276 <p>
1277 a space.
1278 </p>
1279 </li>
1280 <li>
1281 <p>
1283 </p>
1284 </li>
1285 <li>
1286 <p>
1287 a tab or a NUL when <em>-z</em> option is used.
1288 </p>
1289 </li>
1290 <li>
1291 <p>
1293 </p>
1294 </li>
1295 <li>
1296 <p>
1297 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1298 </p>
1299 </li>
1300 <li>
1301 <p>
1303 </p>
1304 </li>
1305 <li>
1306 <p>
1307 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1308 </p>
1309 </li>
1310 </ol></div>
1313 <li>
1314 <p>
1315 A: addition of a file
1316 </p>
1317 </li>
1318 <li>
1319 <p>
1320 C: copy of a file into a new one
1321 </p>
1322 </li>
1323 <li>
1324 <p>
1325 D: deletion of a file
1326 </p>
1327 </li>
1328 <li>
1329 <p>
1330 M: modification of the contents or mode of a file
1331 </p>
1332 </li>
1333 <li>
1334 <p>
1335 R: renaming of a file
1336 </p>
1337 </li>
1338 <li>
1339 <p>
1340 T: change in the type of the file
1341 </p>
1342 </li>
1343 <li>
1344 <p>
1345 U: file is unmerged (you must complete the merge before it can
1346 be committed)
1347 </p>
1348 </li>
1349 <li>
1350 <p>
1352 </p>
1353 </li>
1354 </ul></div>
1356 percentage of similarity between the source and target of the move or
1357 copy), and are the only ones to be so.</p></div>
1358 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1359 and it is out of sync with the index.</p></div>
1363 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1364 </div></div>
1365 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1366 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1367 respectively.</p></div>
1368 </div>
1372 can take <em>-c</em> or <em>--cc</em> option
1373 to generate diff output also for merge commits. The output differs
1374 from the format described above in the following way:</p></div>
1376 <li>
1377 <p>
1378 there is a colon for each parent
1379 </p>
1380 </li>
1381 <li>
1382 <p>
1384 </p>
1385 </li>
1386 <li>
1387 <p>
1388 status is concatenated status characters for each parent
1389 </p>
1390 </li>
1391 <li>
1392 <p>
1394 </p>
1395 </li>
1396 <li>
1397 <p>
1399 </p>
1400 </li>
1401 </ol></div>
1405 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1406 </div></div>
1407 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1408 all parents.</p></div>
1409 </div>
1415 do not produce the output described above; instead they produce a
1416 patch file. You can customize the creation of such patches via the
1417 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1418 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1419 diff format:</p></div>
1421 <li>
1422 <p>
1424 </p>
1427 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1428 </div></div>
1429 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1430 involved. Especially, even for a creation or a deletion,
1431 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1432 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1433 name of the source file of the rename/copy and the name of
1434 the file that rename/copy produces, respectively.</p></div>
1435 </li>
1436 <li>
1437 <p>
1438 It is followed by one or more extended header lines:
1439 </p>
1442 <pre><tt>old mode <mode>
1443 new mode <mode>
1444 deleted file mode <mode>
1445 new file mode <mode>
1446 copy from <path>
1447 copy to <path>
1448 rename from <path>
1449 rename to <path>
1450 similarity index <number>
1451 dissimilarity index <number>
1452 index <hash>..<hash> <mode></tt></pre>
1453 </div></div>
1454 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1455 and file permission bits.</p></div>
1456 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1458 the dissimilarity index is the percentage of changed lines. It
1459 is a rounded down integer, followed by a percent sign. The
1460 similarity index value of 100% is thus reserved for two equal
1461 files, while 100% dissimilarity means that no line from the old
1462 file made it into the new one.</p></div>
1463 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1464 The <mode> is included if the file mode does not change; otherwise,
1465 separate lines indicate the old and the new mode.</p></div>
1466 </li>
1467 <li>
1468 <p>
1469 TAB, LF, double quote and backslash characters in pathnames
1471 If there is need for such substitution then the whole
1472 pathname is put in double quotes.
1473 </p>
1474 </li>
1475 <li>
1476 <p>
1479 It is incorrect to apply each change to each file sequentially. For
1480 example, this patch will swap a and b:
1481 </p>
1484 <pre><tt>diff --git a/a b/b
1485 rename from a
1486 rename to b
1487 diff --git a/b b/a
1488 rename from b
1489 rename to a</tt></pre>
1490 </div></div>
1491 </li>
1492 </ol></div>
1493 </div>
1496 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1499 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1500 of these commands to force generation of diffs with individual parents
1501 of a merge.</p></div>
1505 <pre><tt>diff --combined describe.c
1506 index fabadb8,cc95eb0..4866510
1507 --- a/describe.c
1508 +++ b/describe.c
1511 }
1513 - static void describe(char *arg)
1514 -static void describe(struct commit *cmit, int last_one)
1515 ++static void describe(char *arg, int last_one)
1516 {
1517 + unsigned char sha1[20];
1518 + struct commit *cmit;
1519 struct commit_list *list;
1520 static int initialized = 0;
1521 struct commit_name *n;
1524 + usage(describe_usage);
1525 + cmit = lookup_commit_reference(sha1);
1526 + if (!cmit)
1527 + usage(describe_usage);
1528 +
1529 if (!initialized) {
1530 initialized = 1;
1531 for_each_ref(get_name);</tt></pre>
1532 </div></div>
1534 <li>
1535 <p>
1536 It is preceded with a "git diff" header, that looks like
1538 </p>
1542 </div></div>
1547 </div></div>
1548 </li>
1549 <li>
1550 <p>
1551 It is followed by one or more extended header lines
1552 (this example shows a merge with two parents):
1553 </p>
1560 </div></div>
1561 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1563 information about detected contents movement (renames and
1564 copying detection) are designed to work with diff of two
1566 </li>
1567 <li>
1568 <p>
1569 It is followed by two-line from-file/to-file header
1570 </p>
1573 <pre><tt>--- a/file
1574 +++ b/file</tt></pre>
1575 </div></div>
1578 files.</p></div>
1579 </li>
1580 <li>
1581 <p>
1582 Chunk header format is modified to prevent people from
1584 was created for review of merge commit changes, and was not
1585 meant for apply. The change is similar to the change in the
1587 </p>
1590 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1591 </div></div>
1593 header for combined diff format.</p></div>
1594 </li>
1595 </ol></div>
1597 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
1599 compares two or more files file1, file2,… with one file X, and
1600 shows how X differs from each of fileN. One column for each of
1601 fileN is prepended to the output line to note how X’s line is
1602 different from it.</p></div>
1603 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1605 in the column N means that the line appears in the result,
1606 and fileN does not have that line (in other words, the line was
1607 added, from the point of view of that parent).</p></div>
1611 in either file1 nor file2). Also eight other lines are the same
1613 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1614 merge commit with the merge result (i.e. file1..fileN are the
1616 two unresolved merge parents with the working tree file
1619 </div>
1622 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1624 output. These options can be combined with other options, such as
1626 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1627 formats the pathnames compactly by combining common prefix and suffix of
1633 </div></div>
1634 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1636 like this:</p></div>
1641 </div></div>
1644 <li>
1645 <p>
1646 the number of added lines;
1647 </p>
1648 </li>
1649 <li>
1650 <p>
1651 a tab;
1652 </p>
1653 </li>
1654 <li>
1655 <p>
1656 the number of deleted lines;
1657 </p>
1658 </li>
1659 <li>
1660 <p>
1661 a tab;
1662 </p>
1663 </li>
1664 <li>
1665 <p>
1666 pathname (possibly with rename/copy information);
1667 </p>
1668 </li>
1669 <li>
1670 <p>
1671 a newline.
1672 </p>
1673 </li>
1674 </ol></div>
1675 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1680 </div></div>
1683 <li>
1684 <p>
1685 the number of added lines;
1686 </p>
1687 </li>
1688 <li>
1689 <p>
1690 a tab;
1691 </p>
1692 </li>
1693 <li>
1694 <p>
1695 the number of deleted lines;
1696 </p>
1697 </li>
1698 <li>
1699 <p>
1700 a tab;
1701 </p>
1702 </li>
1703 <li>
1704 <p>
1705 a NUL (only exists if renamed/copied);
1706 </p>
1707 </li>
1708 <li>
1709 <p>
1710 pathname in preimage;
1711 </p>
1712 </li>
1713 <li>
1714 <p>
1715 a NUL (only exists if renamed/copied);
1716 </p>
1717 </li>
1718 <li>
1719 <p>
1720 pathname in postimage (only exists if renamed/copied);
1721 </p>
1722 </li>
1723 <li>
1724 <p>
1725 a NUL.
1726 </p>
1727 </li>
1728 </ol></div>
1729 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1730 scripts that read the output to tell if the current record being read is
1731 a single-path record or a rename/copy record without reading ahead.
1734 </div>
1738 </div>
1742 </div>
1743 </div>
1744 </body>
1745 </html>