| blob | 1829e2cd68f2b326d542b81e1f19bb6ed2189f37 |
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 (number of lines added or
521 removed) for each sub-directory. Directories with changes below
522 a cut-off percent (3% by default) are not shown. The cut-off percent
525 </p>
526 </dd>
529 </dt>
530 <dd>
531 <p>
533 </p>
534 </dd>
536 --summary
537 </dt>
538 <dd>
539 <p>
540 Output a condensed summary of extended header information
541 such as creations, renames and mode changes.
542 </p>
543 </dd>
545 --patch-with-stat
546 </dt>
547 <dd>
548 <p>
550 </p>
551 </dd>
553 -z
554 </dt>
555 <dd>
556 <p>
557 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
558 given, do not munge pathnames and use NULs as output field terminators.
559 </p>
560 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
562 respectively, and the pathname will be enclosed in double quotes if
563 any of those replacements occurred.</p></div>
564 </dd>
566 --name-only
567 </dt>
568 <dd>
569 <p>
570 Show only names of changed files.
571 </p>
572 </dd>
574 --name-status
575 </dt>
576 <dd>
577 <p>
578 Show only names and status of changed files. See the description
579 of the <tt>--diff-filter</tt> option on what the status letters mean.
580 </p>
581 </dd>
583 --submodule[=<format>]
584 </dt>
585 <dd>
586 <p>
587 Chose the output format for submodule differences. <format> can be one of
588 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
589 is used when this option is not given. <em>log</em> is the default value for this
590 option and lists the commits in that commit range like the <em>summary</em>
592 </p>
593 </dd>
595 --color[=<when>]
596 </dt>
597 <dd>
598 <p>
599 Show colored diff.
600 The value must be always (the default), never, or auto.
601 </p>
602 </dd>
604 --no-color
605 </dt>
606 <dd>
607 <p>
608 Turn off colored diff, even when the configuration file
609 gives the default to color output.
610 Same as <tt>--color=never</tt>.
611 </p>
612 </dd>
614 --word-diff[=<mode>]
615 </dt>
616 <dd>
617 <p>
618 Show a word diff, using the <mode> to delimit changed words.
619 By default, words are delimited by whitespace; see
620 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
621 must be one of:
622 </p>
625 color
626 </dt>
627 <dd>
628 <p>
629 Highlight changed words using only colors. Implies <tt>--color</tt>.
630 </p>
631 </dd>
633 plain
634 </dt>
635 <dd>
636 <p>
637 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
638 attempts to escape the delimiters if they appear in the input,
639 so the output may be ambiguous.
640 </p>
641 </dd>
643 porcelain
644 </dt>
645 <dd>
646 <p>
647 Use a special line-based format intended for script
648 consumption. Added/removed/unchanged runs are printed in the
649 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
650 character at the beginning of the line and extending to the
651 end of the line. Newlines in the input are represented by a
652 tilde <tt>~</tt> on a line of its own.
653 </p>
654 </dd>
656 none
657 </dt>
658 <dd>
659 <p>
660 Disable word diff again.
661 </p>
662 </dd>
663 </dl></div>
665 highlight the changed parts in all modes if enabled.</p></div>
666 </dd>
668 --word-diff-regex=<regex>
669 </dt>
670 <dd>
671 <p>
672 Use <regex> to decide what a word is, instead of considering
673 runs of non-whitespace to be a word. Also implies
674 <tt>--word-diff</tt> unless it was already enabled.
675 </p>
677 <regex> is considered a word. Anything between these matches is
678 considered whitespace and ignored(!) for the purposes of finding
679 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
680 expression to make sure that it matches all non-whitespace characters.
681 A match that contains a newline is silently truncated(!) at the
682 newline.</p></div>
683 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
684 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
685 overrides any diff driver or configuration setting. Diff drivers
686 override configuration settings.</p></div>
687 </dd>
689 --color-words[=<regex>]
690 </dt>
691 <dd>
692 <p>
693 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
694 specified) <tt>--word-diff-regex=<regex></tt>.
695 </p>
696 </dd>
698 --no-renames
699 </dt>
700 <dd>
701 <p>
702 Turn off rename detection, even when the configuration
703 file gives the default to do so.
704 </p>
705 </dd>
707 --check
708 </dt>
709 <dd>
710 <p>
711 Warn if changes introduce trailing whitespace
712 or an indent that uses a space before a tab. Exits with
713 non-zero status if problems are found. Not compatible with
714 --exit-code.
715 </p>
716 </dd>
718 --full-index
719 </dt>
720 <dd>
721 <p>
722 Instead of the first handful of characters, show the full
724 line when generating patch format output.
725 </p>
726 </dd>
728 --binary
729 </dt>
730 <dd>
731 <p>
732 In addition to <tt>--full-index</tt>, output a binary diff that
733 can be applied with <tt>git-apply</tt>.
734 </p>
735 </dd>
737 --abbrev[=<n>]
738 </dt>
739 <dd>
740 <p>
741 Instead of showing the full 40-byte hexadecimal object
742 name in diff-raw format output and diff-tree header
743 lines, show only a partial prefix. This is
744 independent of the <tt>--full-index</tt> option above, which controls
745 the diff-patch output format. Non default number of
746 digits can be specified with <tt>--abbrev=<n></tt>.
747 </p>
748 </dd>
750 -B[<n>][/<m>]
751 </dt>
753 --break-rewrites[=[<n>][/<m>]]
754 </dt>
755 <dd>
756 <p>
757 Break complete rewrite changes into pairs of delete and
758 create. This serves two purposes:
759 </p>
761 not as a series of deletion and insertion mixed together with a very
762 few lines that happen to match textually as the context, but as a
763 single deletion of everything old followed by a single insertion of
764 everything new, and the number <tt>m</tt> controls this aspect of the -B
765 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
766 original should remain in the result for git to consider it a total
767 rewrite (i.e. otherwise the resulting patch will be a series of
768 deletion and insertion mixed together with context lines).</p></div>
770 source of a rename (usually -M only considers a file that disappeared
771 as the source of a rename), and the number <tt>n</tt> controls this aspect of
772 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
773 addition and deletion compared to 20% or more of the file’s size are
774 eligible for being picked up as a possible source of a rename to
775 another file.</p></div>
776 </dd>
778 -M[<n>]
779 </dt>
781 --find-renames[=<n>]
782 </dt>
783 <dd>
784 <p>
785 Detect renames.
786 If <tt>n</tt> is specified, it is a is a threshold on the similarity
787 index (i.e. amount of addition/deletions compared to the
788 file’s size). For example, <tt>-M90%</tt> means git should consider a
789 delete/add pair to be a rename if more than 90% of the file
790 hasn’t changed.
791 </p>
792 </dd>
794 -C[<n>]
795 </dt>
797 --find-copies[=<n>]
798 </dt>
799 <dd>
800 <p>
801 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
802 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
803 </p>
804 </dd>
806 --find-copies-harder
807 </dt>
808 <dd>
809 <p>
810 For performance reasons, by default, <tt>-C</tt> option finds copies only
811 if the original file of the copy was modified in the same
812 changeset. This flag makes the command
813 inspect unmodified files as candidates for the source of
814 copy. This is a very expensive operation for large
815 projects, so use it with caution. Giving more than one
816 <tt>-C</tt> option has the same effect.
817 </p>
818 </dd>
820 -l<num>
821 </dt>
822 <dd>
823 <p>
824 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
825 is the number of potential rename/copy targets. This
826 option prevents rename/copy detection from running if
827 the number of rename/copy targets exceeds the specified
828 number.
829 </p>
830 </dd>
832 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
833 </dt>
834 <dd>
835 <p>
836 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
837 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
838 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
839 are Unmerged (<tt>U</tt>), are
840 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
841 Any combination of the filter characters (including none) can be used.
842 When <tt>*</tt> (All-or-none) is added to the combination, all
843 paths are selected if there is any file that matches
844 other criteria in the comparison; if there is no file
845 that matches other criteria, nothing is selected.
846 </p>
847 </dd>
849 -S<string>
850 </dt>
851 <dd>
852 <p>
853 Look for differences that introduce or remove an instance of
854 <string>. Note that this is different than the string simply
855 appearing in diff output; see the <em>pickaxe</em> entry in
857 </p>
858 </dd>
860 -G<regex>
861 </dt>
862 <dd>
863 <p>
864 Look for differences whose added or removed line matches
865 the given <regex>.
866 </p>
867 </dd>
869 --pickaxe-all
870 </dt>
871 <dd>
872 <p>
873 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
874 changeset, not just the files that contain the change
875 in <string>.
876 </p>
877 </dd>
879 --pickaxe-regex
880 </dt>
881 <dd>
882 <p>
883 Make the <string> not a plain string but an extended POSIX
884 regex to match.
885 </p>
886 </dd>
888 -O<orderfile>
889 </dt>
890 <dd>
891 <p>
892 Output the patch in the order specified in the
893 <orderfile>, which has one shell glob pattern per line.
894 </p>
895 </dd>
897 -R
898 </dt>
899 <dd>
900 <p>
901 Swap two inputs; that is, show differences from index or
902 on-disk file to tree contents.
903 </p>
904 </dd>
906 --relative[=<path>]
907 </dt>
908 <dd>
909 <p>
910 When run from a subdirectory of the project, it can be
911 told to exclude changes outside the directory and show
912 pathnames relative to it with this option. When you are
913 not in a subdirectory (e.g. in a bare repository), you
914 can name which subdirectory to make the output relative
915 to by giving a <path> as an argument.
916 </p>
917 </dd>
919 -a
920 </dt>
922 --text
923 </dt>
924 <dd>
925 <p>
926 Treat all files as text.
927 </p>
928 </dd>
930 --ignore-space-at-eol
931 </dt>
932 <dd>
933 <p>
934 Ignore changes in whitespace at EOL.
935 </p>
936 </dd>
938 -b
939 </dt>
941 --ignore-space-change
942 </dt>
943 <dd>
944 <p>
945 Ignore changes in amount of whitespace. This ignores whitespace
946 at line end, and considers all other sequences of one or
947 more whitespace characters to be equivalent.
948 </p>
949 </dd>
951 -w
952 </dt>
954 --ignore-all-space
955 </dt>
956 <dd>
957 <p>
958 Ignore whitespace when comparing lines. This ignores
959 differences even if one line has whitespace where the other
960 line has none.
961 </p>
962 </dd>
964 --inter-hunk-context=<lines>
965 </dt>
966 <dd>
967 <p>
968 Show the context between diff hunks, up to the specified number
969 of lines, thereby fusing hunks that are close to each other.
970 </p>
971 </dd>
973 --exit-code
974 </dt>
975 <dd>
976 <p>
977 Make the program exit with codes similar to diff(1).
978 That is, it exits with 1 if there were differences and
979 0 means no differences.
980 </p>
981 </dd>
983 --quiet
984 </dt>
985 <dd>
986 <p>
987 Disable all output of the program. Implies <tt>--exit-code</tt>.
988 </p>
989 </dd>
991 --ext-diff
992 </dt>
993 <dd>
994 <p>
995 Allow an external diff helper to be executed. If you set an
998 </p>
999 </dd>
1001 --no-ext-diff
1002 </dt>
1003 <dd>
1004 <p>
1005 Disallow external diff drivers.
1006 </p>
1007 </dd>
1009 --ignore-submodules[=<when>]
1010 </dt>
1011 <dd>
1012 <p>
1013 Ignore changes to submodules in the diff generation. <when> can be
1016 untracked or modified files or its HEAD differs from the commit recorded
1017 in the superproject and can be used to override any settings of the
1018 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1020 contain untracked content (but they are still scanned for modified
1022 only changes to the commits stored in the superproject are shown (this was
1024 </p>
1025 </dd>
1027 --src-prefix=<prefix>
1028 </dt>
1029 <dd>
1030 <p>
1032 </p>
1033 </dd>
1035 --dst-prefix=<prefix>
1036 </dt>
1037 <dd>
1038 <p>
1040 </p>
1041 </dd>
1043 --no-prefix
1044 </dt>
1045 <dd>
1046 <p>
1047 Do not show any source or destination prefix.
1048 </p>
1049 </dd>
1050 </dl></div>
1055 -1 --base
1056 </dt>
1058 -2 --ours
1059 </dt>
1061 -3 --theirs
1062 </dt>
1064 -0
1065 </dt>
1066 <dd>
1067 <p>
1069 branch" respectively. With these options, diffs for
1070 merged entries are not shown.
1071 </p>
1073 cleanly resolved paths. The option -0 can be given to
1075 </dd>
1077 -c
1078 </dt>
1080 --cc
1081 </dt>
1082 <dd>
1083 <p>
1084 This compares stage 2 (our branch), stage 3 (their
1085 branch) and the working tree file and outputs a combined
1086 diff, similar to the way <em>diff-tree</em> shows a merge
1087 commit with these flags.
1088 </p>
1089 </dd>
1091 -q
1092 </dt>
1093 <dd>
1094 <p>
1095 Remain silent even on nonexistent files
1096 </p>
1097 </dd>
1098 </dl></div>
1099 </div>
1105 compared differs:</p></div>
1108 git-diff-index <tree-ish>
1109 </dt>
1110 <dd>
1111 <p>
1112 compares the <tree-ish> and the files on the filesystem.
1113 </p>
1114 </dd>
1116 git-diff-index --cached <tree-ish>
1117 </dt>
1118 <dd>
1119 <p>
1120 compares the <tree-ish> and the index.
1121 </p>
1122 </dd>
1124 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1125 </dt>
1126 <dd>
1127 <p>
1128 compares the trees named by the two arguments.
1129 </p>
1130 </dd>
1132 git-diff-files [<pattern>…]
1133 </dt>
1134 <dd>
1135 <p>
1136 compares the index and the files on the filesystem.
1137 </p>
1138 </dd>
1139 </dl></div>
1140 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1141 what is being compared. After that, all the commands print one output
1142 line per changed file.</p></div>
1146 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1147 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1148 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1149 create :000000 100644 0000000... 1234567... A file4
1150 delete :100644 000000 1234567... 0000000... D file5
1151 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1152 </div></div>
1155 <li>
1156 <p>
1157 a colon.
1158 </p>
1159 </li>
1160 <li>
1161 <p>
1163 </p>
1164 </li>
1165 <li>
1166 <p>
1167 a space.
1168 </p>
1169 </li>
1170 <li>
1171 <p>
1173 </p>
1174 </li>
1175 <li>
1176 <p>
1177 a space.
1178 </p>
1179 </li>
1180 <li>
1181 <p>
1183 </p>
1184 </li>
1185 <li>
1186 <p>
1187 a space.
1188 </p>
1189 </li>
1190 <li>
1191 <p>
1193 </p>
1194 </li>
1195 <li>
1196 <p>
1197 a space.
1198 </p>
1199 </li>
1200 <li>
1201 <p>
1203 </p>
1204 </li>
1205 <li>
1206 <p>
1207 a tab or a NUL when <em>-z</em> option is used.
1208 </p>
1209 </li>
1210 <li>
1211 <p>
1213 </p>
1214 </li>
1215 <li>
1216 <p>
1217 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1218 </p>
1219 </li>
1220 <li>
1221 <p>
1223 </p>
1224 </li>
1225 <li>
1226 <p>
1227 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1228 </p>
1229 </li>
1230 </ol></div>
1233 <li>
1234 <p>
1235 A: addition of a file
1236 </p>
1237 </li>
1238 <li>
1239 <p>
1240 C: copy of a file into a new one
1241 </p>
1242 </li>
1243 <li>
1244 <p>
1245 D: deletion of a file
1246 </p>
1247 </li>
1248 <li>
1249 <p>
1250 M: modification of the contents or mode of a file
1251 </p>
1252 </li>
1253 <li>
1254 <p>
1255 R: renaming of a file
1256 </p>
1257 </li>
1258 <li>
1259 <p>
1260 T: change in the type of the file
1261 </p>
1262 </li>
1263 <li>
1264 <p>
1265 U: file is unmerged (you must complete the merge before it can
1266 be committed)
1267 </p>
1268 </li>
1269 <li>
1270 <p>
1272 </p>
1273 </li>
1274 </ul></div>
1276 percentage of similarity between the source and target of the move or
1277 copy), and are the only ones to be so.</p></div>
1278 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1279 and it is out of sync with the index.</p></div>
1283 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1284 </div></div>
1285 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1286 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1287 respectively.</p></div>
1288 </div>
1292 can take <em>-c</em> or <em>--cc</em> option
1293 to generate diff output also for merge commits. The output differs
1294 from the format described above in the following way:</p></div>
1296 <li>
1297 <p>
1298 there is a colon for each parent
1299 </p>
1300 </li>
1301 <li>
1302 <p>
1304 </p>
1305 </li>
1306 <li>
1307 <p>
1308 status is concatenated status characters for each parent
1309 </p>
1310 </li>
1311 <li>
1312 <p>
1314 </p>
1315 </li>
1316 <li>
1317 <p>
1319 </p>
1320 </li>
1321 </ol></div>
1325 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1326 </div></div>
1327 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1328 all parents.</p></div>
1329 </div>
1335 do not produce the output described above; instead they produce a
1336 patch file. You can customize the creation of such patches via the
1337 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1338 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1339 diff format:</p></div>
1341 <li>
1342 <p>
1344 </p>
1347 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1348 </div></div>
1349 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1350 involved. Especially, even for a creation or a deletion,
1351 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1352 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1353 name of the source file of the rename/copy and the name of
1354 the file that rename/copy produces, respectively.</p></div>
1355 </li>
1356 <li>
1357 <p>
1358 It is followed by one or more extended header lines:
1359 </p>
1362 <pre><tt>old mode <mode>
1363 new mode <mode>
1364 deleted file mode <mode>
1365 new file mode <mode>
1366 copy from <path>
1367 copy to <path>
1368 rename from <path>
1369 rename to <path>
1370 similarity index <number>
1371 dissimilarity index <number>
1372 index <hash>..<hash> <mode></tt></pre>
1373 </div></div>
1374 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1375 and file permission bits.</p></div>
1376 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1378 the dissimilarity index is the percentage of changed lines. It
1379 is a rounded down integer, followed by a percent sign. The
1380 similarity index value of 100% is thus reserved for two equal
1381 files, while 100% dissimilarity means that no line from the old
1382 file made it into the new one.</p></div>
1383 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1384 The <mode> is included if the file mode does not change; otherwise,
1385 separate lines indicate the old and the new mode.</p></div>
1386 </li>
1387 <li>
1388 <p>
1389 TAB, LF, double quote and backslash characters in pathnames
1391 If there is need for such substitution then the whole
1392 pathname is put in double quotes.
1393 </p>
1394 </li>
1395 <li>
1396 <p>
1399 It is incorrect to apply each change to each file sequentially. For
1400 example, this patch will swap a and b:
1401 </p>
1404 <pre><tt>diff --git a/a b/b
1405 rename from a
1406 rename to b
1407 diff --git a/b b/a
1408 rename from b
1409 rename to a</tt></pre>
1410 </div></div>
1411 </li>
1412 </ol></div>
1413 </div>
1416 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1419 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1420 of these commands to force generation of diffs with individual parents
1421 of a merge.</p></div>
1425 <pre><tt>diff --combined describe.c
1426 index fabadb8,cc95eb0..4866510
1427 --- a/describe.c
1428 +++ b/describe.c
1431 }
1433 - static void describe(char *arg)
1434 -static void describe(struct commit *cmit, int last_one)
1435 ++static void describe(char *arg, int last_one)
1436 {
1437 + unsigned char sha1[20];
1438 + struct commit *cmit;
1439 struct commit_list *list;
1440 static int initialized = 0;
1441 struct commit_name *n;
1444 + usage(describe_usage);
1445 + cmit = lookup_commit_reference(sha1);
1446 + if (!cmit)
1447 + usage(describe_usage);
1448 +
1449 if (!initialized) {
1450 initialized = 1;
1451 for_each_ref(get_name);</tt></pre>
1452 </div></div>
1454 <li>
1455 <p>
1456 It is preceded with a "git diff" header, that looks like
1458 </p>
1462 </div></div>
1467 </div></div>
1468 </li>
1469 <li>
1470 <p>
1471 It is followed by one or more extended header lines
1472 (this example shows a merge with two parents):
1473 </p>
1480 </div></div>
1481 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1483 information about detected contents movement (renames and
1484 copying detection) are designed to work with diff of two
1486 </li>
1487 <li>
1488 <p>
1489 It is followed by two-line from-file/to-file header
1490 </p>
1493 <pre><tt>--- a/file
1494 +++ b/file</tt></pre>
1495 </div></div>
1498 files.</p></div>
1499 </li>
1500 <li>
1501 <p>
1502 Chunk header format is modified to prevent people from
1504 was created for review of merge commit changes, and was not
1505 meant for apply. The change is similar to the change in the
1507 </p>
1510 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1511 </div></div>
1513 header for combined diff format.</p></div>
1514 </li>
1515 </ol></div>
1517 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
1519 compares two or more files file1, file2,… with one file X, and
1520 shows how X differs from each of fileN. One column for each of
1521 fileN is prepended to the output line to note how X’s line is
1522 different from it.</p></div>
1523 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1525 in the column N means that the line appears in the result,
1526 and fileN does not have that line (in other words, the line was
1527 added, from the point of view of that parent).</p></div>
1531 in either file1 nor file2). Also eight other lines are the same
1533 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1534 merge commit with the merge result (i.e. file1..fileN are the
1536 two unresolved merge parents with the working tree file
1539 </div>
1542 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1544 output. These options can be combined with other options, such as
1546 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1547 formats the pathnames compactly by combining common prefix and suffix of
1553 </div></div>
1554 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1556 like this:</p></div>
1561 </div></div>
1564 <li>
1565 <p>
1566 the number of added lines;
1567 </p>
1568 </li>
1569 <li>
1570 <p>
1571 a tab;
1572 </p>
1573 </li>
1574 <li>
1575 <p>
1576 the number of deleted lines;
1577 </p>
1578 </li>
1579 <li>
1580 <p>
1581 a tab;
1582 </p>
1583 </li>
1584 <li>
1585 <p>
1586 pathname (possibly with rename/copy information);
1587 </p>
1588 </li>
1589 <li>
1590 <p>
1591 a newline.
1592 </p>
1593 </li>
1594 </ol></div>
1595 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1600 </div></div>
1603 <li>
1604 <p>
1605 the number of added lines;
1606 </p>
1607 </li>
1608 <li>
1609 <p>
1610 a tab;
1611 </p>
1612 </li>
1613 <li>
1614 <p>
1615 the number of deleted lines;
1616 </p>
1617 </li>
1618 <li>
1619 <p>
1620 a tab;
1621 </p>
1622 </li>
1623 <li>
1624 <p>
1625 a NUL (only exists if renamed/copied);
1626 </p>
1627 </li>
1628 <li>
1629 <p>
1630 pathname in preimage;
1631 </p>
1632 </li>
1633 <li>
1634 <p>
1635 a NUL (only exists if renamed/copied);
1636 </p>
1637 </li>
1638 <li>
1639 <p>
1640 pathname in postimage (only exists if renamed/copied);
1641 </p>
1642 </li>
1643 <li>
1644 <p>
1645 a NUL.
1646 </p>
1647 </li>
1648 </ol></div>
1649 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1650 scripts that read the output to tell if the current record being read is
1651 a single-path record or a rename/copy record without reading ahead.
1654 </div>
1658 </div>
1662 </div>
1663 </div>
1664 </body>
1665 </html>