| blob | 408185e96e251f213b9ac15f5390d175c4c9612a |
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 <div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring
527 the amount of pure code movements within a file. In other words,
528 rearranging lines in a file is not counted as much as other changes.</p></div>
529 </dd>
532 </dt>
533 <dd>
534 <p>
536 </p>
537 </dd>
539 --summary
540 </dt>
541 <dd>
542 <p>
543 Output a condensed summary of extended header information
544 such as creations, renames and mode changes.
545 </p>
546 </dd>
548 --patch-with-stat
549 </dt>
550 <dd>
551 <p>
553 </p>
554 </dd>
556 -z
557 </dt>
558 <dd>
559 <p>
560 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
561 given, do not munge pathnames and use NULs as output field terminators.
562 </p>
563 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
565 respectively, and the pathname will be enclosed in double quotes if
566 any of those replacements occurred.</p></div>
567 </dd>
569 --name-only
570 </dt>
571 <dd>
572 <p>
573 Show only names of changed files.
574 </p>
575 </dd>
577 --name-status
578 </dt>
579 <dd>
580 <p>
581 Show only names and status of changed files. See the description
582 of the <tt>--diff-filter</tt> option on what the status letters mean.
583 </p>
584 </dd>
586 --submodule[=<format>]
587 </dt>
588 <dd>
589 <p>
590 Chose the output format for submodule differences. <format> can be one of
591 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
592 is used when this option is not given. <em>log</em> is the default value for this
593 option and lists the commits in that commit range like the <em>summary</em>
595 </p>
596 </dd>
598 --color[=<when>]
599 </dt>
600 <dd>
601 <p>
602 Show colored diff.
603 The value must be always (the default), never, or auto.
604 </p>
605 </dd>
607 --no-color
608 </dt>
609 <dd>
610 <p>
611 Turn off colored diff, even when the configuration file
612 gives the default to color output.
613 Same as <tt>--color=never</tt>.
614 </p>
615 </dd>
617 --word-diff[=<mode>]
618 </dt>
619 <dd>
620 <p>
621 Show a word diff, using the <mode> to delimit changed words.
622 By default, words are delimited by whitespace; see
623 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
624 must be one of:
625 </p>
628 color
629 </dt>
630 <dd>
631 <p>
632 Highlight changed words using only colors. Implies <tt>--color</tt>.
633 </p>
634 </dd>
636 plain
637 </dt>
638 <dd>
639 <p>
640 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
641 attempts to escape the delimiters if they appear in the input,
642 so the output may be ambiguous.
643 </p>
644 </dd>
646 porcelain
647 </dt>
648 <dd>
649 <p>
650 Use a special line-based format intended for script
651 consumption. Added/removed/unchanged runs are printed in the
652 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
653 character at the beginning of the line and extending to the
654 end of the line. Newlines in the input are represented by a
655 tilde <tt>~</tt> on a line of its own.
656 </p>
657 </dd>
659 none
660 </dt>
661 <dd>
662 <p>
663 Disable word diff again.
664 </p>
665 </dd>
666 </dl></div>
668 highlight the changed parts in all modes if enabled.</p></div>
669 </dd>
671 --word-diff-regex=<regex>
672 </dt>
673 <dd>
674 <p>
675 Use <regex> to decide what a word is, instead of considering
676 runs of non-whitespace to be a word. Also implies
677 <tt>--word-diff</tt> unless it was already enabled.
678 </p>
680 <regex> is considered a word. Anything between these matches is
681 considered whitespace and ignored(!) for the purposes of finding
682 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
683 expression to make sure that it matches all non-whitespace characters.
684 A match that contains a newline is silently truncated(!) at the
685 newline.</p></div>
686 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
687 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
688 overrides any diff driver or configuration setting. Diff drivers
689 override configuration settings.</p></div>
690 </dd>
692 --color-words[=<regex>]
693 </dt>
694 <dd>
695 <p>
696 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
697 specified) <tt>--word-diff-regex=<regex></tt>.
698 </p>
699 </dd>
701 --no-renames
702 </dt>
703 <dd>
704 <p>
705 Turn off rename detection, even when the configuration
706 file gives the default to do so.
707 </p>
708 </dd>
710 --check
711 </dt>
712 <dd>
713 <p>
714 Warn if changes introduce trailing whitespace
715 or an indent that uses a space before a tab. Exits with
716 non-zero status if problems are found. Not compatible with
717 --exit-code.
718 </p>
719 </dd>
721 --full-index
722 </dt>
723 <dd>
724 <p>
725 Instead of the first handful of characters, show the full
727 line when generating patch format output.
728 </p>
729 </dd>
731 --binary
732 </dt>
733 <dd>
734 <p>
735 In addition to <tt>--full-index</tt>, output a binary diff that
736 can be applied with <tt>git-apply</tt>.
737 </p>
738 </dd>
740 --abbrev[=<n>]
741 </dt>
742 <dd>
743 <p>
744 Instead of showing the full 40-byte hexadecimal object
745 name in diff-raw format output and diff-tree header
746 lines, show only a partial prefix. This is
747 independent of the <tt>--full-index</tt> option above, which controls
748 the diff-patch output format. Non default number of
749 digits can be specified with <tt>--abbrev=<n></tt>.
750 </p>
751 </dd>
753 -B[<n>][/<m>]
754 </dt>
756 --break-rewrites[=[<n>][/<m>]]
757 </dt>
758 <dd>
759 <p>
760 Break complete rewrite changes into pairs of delete and
761 create. This serves two purposes:
762 </p>
764 not as a series of deletion and insertion mixed together with a very
765 few lines that happen to match textually as the context, but as a
766 single deletion of everything old followed by a single insertion of
767 everything new, and the number <tt>m</tt> controls this aspect of the -B
768 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
769 original should remain in the result for git to consider it a total
770 rewrite (i.e. otherwise the resulting patch will be a series of
771 deletion and insertion mixed together with context lines).</p></div>
773 source of a rename (usually -M only considers a file that disappeared
774 as the source of a rename), and the number <tt>n</tt> controls this aspect of
775 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
776 addition and deletion compared to 20% or more of the file’s size are
777 eligible for being picked up as a possible source of a rename to
778 another file.</p></div>
779 </dd>
781 -M[<n>]
782 </dt>
784 --find-renames[=<n>]
785 </dt>
786 <dd>
787 <p>
788 Detect renames.
789 If <tt>n</tt> is specified, it is a is a threshold on the similarity
790 index (i.e. amount of addition/deletions compared to the
791 file’s size). For example, <tt>-M90%</tt> means git should consider a
792 delete/add pair to be a rename if more than 90% of the file
793 hasn’t changed.
794 </p>
795 </dd>
797 -C[<n>]
798 </dt>
800 --find-copies[=<n>]
801 </dt>
802 <dd>
803 <p>
804 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
805 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
806 </p>
807 </dd>
809 --find-copies-harder
810 </dt>
811 <dd>
812 <p>
813 For performance reasons, by default, <tt>-C</tt> option finds copies only
814 if the original file of the copy was modified in the same
815 changeset. This flag makes the command
816 inspect unmodified files as candidates for the source of
817 copy. This is a very expensive operation for large
818 projects, so use it with caution. Giving more than one
819 <tt>-C</tt> option has the same effect.
820 </p>
821 </dd>
823 -D
824 </dt>
826 --irreversible-delete
827 </dt>
828 <dd>
829 <p>
830 Omit the preimage for deletes, i.e. print only the header but not
831 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
832 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
833 solely for people who want to just concentrate on reviewing the
834 text after the change. In addition, the output obviously lack
835 enough information to apply such a patch in reverse, even manually,
836 hence the name of the option.
837 </p>
838 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
839 of a delete/create pair.</p></div>
840 </dd>
842 -l<num>
843 </dt>
844 <dd>
845 <p>
846 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
847 is the number of potential rename/copy targets. This
848 option prevents rename/copy detection from running if
849 the number of rename/copy targets exceeds the specified
850 number.
851 </p>
852 </dd>
854 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
855 </dt>
856 <dd>
857 <p>
858 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
859 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
860 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
861 are Unmerged (<tt>U</tt>), are
862 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
863 Any combination of the filter characters (including none) can be used.
864 When <tt>*</tt> (All-or-none) is added to the combination, all
865 paths are selected if there is any file that matches
866 other criteria in the comparison; if there is no file
867 that matches other criteria, nothing is selected.
868 </p>
869 </dd>
871 -S<string>
872 </dt>
873 <dd>
874 <p>
875 Look for differences that introduce or remove an instance of
876 <string>. Note that this is different than the string simply
877 appearing in diff output; see the <em>pickaxe</em> entry in
879 </p>
880 </dd>
882 -G<regex>
883 </dt>
884 <dd>
885 <p>
886 Look for differences whose added or removed line matches
887 the given <regex>.
888 </p>
889 </dd>
891 --pickaxe-all
892 </dt>
893 <dd>
894 <p>
895 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
896 changeset, not just the files that contain the change
897 in <string>.
898 </p>
899 </dd>
901 --pickaxe-regex
902 </dt>
903 <dd>
904 <p>
905 Make the <string> not a plain string but an extended POSIX
906 regex to match.
907 </p>
908 </dd>
910 -O<orderfile>
911 </dt>
912 <dd>
913 <p>
914 Output the patch in the order specified in the
915 <orderfile>, which has one shell glob pattern per line.
916 </p>
917 </dd>
919 -R
920 </dt>
921 <dd>
922 <p>
923 Swap two inputs; that is, show differences from index or
924 on-disk file to tree contents.
925 </p>
926 </dd>
928 --relative[=<path>]
929 </dt>
930 <dd>
931 <p>
932 When run from a subdirectory of the project, it can be
933 told to exclude changes outside the directory and show
934 pathnames relative to it with this option. When you are
935 not in a subdirectory (e.g. in a bare repository), you
936 can name which subdirectory to make the output relative
937 to by giving a <path> as an argument.
938 </p>
939 </dd>
941 -a
942 </dt>
944 --text
945 </dt>
946 <dd>
947 <p>
948 Treat all files as text.
949 </p>
950 </dd>
952 --ignore-space-at-eol
953 </dt>
954 <dd>
955 <p>
956 Ignore changes in whitespace at EOL.
957 </p>
958 </dd>
960 -b
961 </dt>
963 --ignore-space-change
964 </dt>
965 <dd>
966 <p>
967 Ignore changes in amount of whitespace. This ignores whitespace
968 at line end, and considers all other sequences of one or
969 more whitespace characters to be equivalent.
970 </p>
971 </dd>
973 -w
974 </dt>
976 --ignore-all-space
977 </dt>
978 <dd>
979 <p>
980 Ignore whitespace when comparing lines. This ignores
981 differences even if one line has whitespace where the other
982 line has none.
983 </p>
984 </dd>
986 --inter-hunk-context=<lines>
987 </dt>
988 <dd>
989 <p>
990 Show the context between diff hunks, up to the specified number
991 of lines, thereby fusing hunks that are close to each other.
992 </p>
993 </dd>
995 --exit-code
996 </dt>
997 <dd>
998 <p>
999 Make the program exit with codes similar to diff(1).
1000 That is, it exits with 1 if there were differences and
1001 0 means no differences.
1002 </p>
1003 </dd>
1005 --quiet
1006 </dt>
1007 <dd>
1008 <p>
1009 Disable all output of the program. Implies <tt>--exit-code</tt>.
1010 </p>
1011 </dd>
1013 --ext-diff
1014 </dt>
1015 <dd>
1016 <p>
1017 Allow an external diff helper to be executed. If you set an
1020 </p>
1021 </dd>
1023 --no-ext-diff
1024 </dt>
1025 <dd>
1026 <p>
1027 Disallow external diff drivers.
1028 </p>
1029 </dd>
1031 --ignore-submodules[=<when>]
1032 </dt>
1033 <dd>
1034 <p>
1035 Ignore changes to submodules in the diff generation. <when> can be
1038 untracked or modified files or its HEAD differs from the commit recorded
1039 in the superproject and can be used to override any settings of the
1040 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1042 contain untracked content (but they are still scanned for modified
1044 only changes to the commits stored in the superproject are shown (this was
1046 </p>
1047 </dd>
1049 --src-prefix=<prefix>
1050 </dt>
1051 <dd>
1052 <p>
1054 </p>
1055 </dd>
1057 --dst-prefix=<prefix>
1058 </dt>
1059 <dd>
1060 <p>
1062 </p>
1063 </dd>
1065 --no-prefix
1066 </dt>
1067 <dd>
1068 <p>
1069 Do not show any source or destination prefix.
1070 </p>
1071 </dd>
1072 </dl></div>
1077 -1 --base
1078 </dt>
1080 -2 --ours
1081 </dt>
1083 -3 --theirs
1084 </dt>
1086 -0
1087 </dt>
1088 <dd>
1089 <p>
1091 branch" respectively. With these options, diffs for
1092 merged entries are not shown.
1093 </p>
1095 cleanly resolved paths. The option -0 can be given to
1097 </dd>
1099 -c
1100 </dt>
1102 --cc
1103 </dt>
1104 <dd>
1105 <p>
1106 This compares stage 2 (our branch), stage 3 (their
1107 branch) and the working tree file and outputs a combined
1108 diff, similar to the way <em>diff-tree</em> shows a merge
1109 commit with these flags.
1110 </p>
1111 </dd>
1113 -q
1114 </dt>
1115 <dd>
1116 <p>
1117 Remain silent even on nonexistent files
1118 </p>
1119 </dd>
1120 </dl></div>
1121 </div>
1127 compared differs:</p></div>
1130 git-diff-index <tree-ish>
1131 </dt>
1132 <dd>
1133 <p>
1134 compares the <tree-ish> and the files on the filesystem.
1135 </p>
1136 </dd>
1138 git-diff-index --cached <tree-ish>
1139 </dt>
1140 <dd>
1141 <p>
1142 compares the <tree-ish> and the index.
1143 </p>
1144 </dd>
1146 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1147 </dt>
1148 <dd>
1149 <p>
1150 compares the trees named by the two arguments.
1151 </p>
1152 </dd>
1154 git-diff-files [<pattern>…]
1155 </dt>
1156 <dd>
1157 <p>
1158 compares the index and the files on the filesystem.
1159 </p>
1160 </dd>
1161 </dl></div>
1162 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1163 what is being compared. After that, all the commands print one output
1164 line per changed file.</p></div>
1168 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1169 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1170 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1171 create :000000 100644 0000000... 1234567... A file4
1172 delete :100644 000000 1234567... 0000000... D file5
1173 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1174 </div></div>
1177 <li>
1178 <p>
1179 a colon.
1180 </p>
1181 </li>
1182 <li>
1183 <p>
1185 </p>
1186 </li>
1187 <li>
1188 <p>
1189 a space.
1190 </p>
1191 </li>
1192 <li>
1193 <p>
1195 </p>
1196 </li>
1197 <li>
1198 <p>
1199 a space.
1200 </p>
1201 </li>
1202 <li>
1203 <p>
1205 </p>
1206 </li>
1207 <li>
1208 <p>
1209 a space.
1210 </p>
1211 </li>
1212 <li>
1213 <p>
1215 </p>
1216 </li>
1217 <li>
1218 <p>
1219 a space.
1220 </p>
1221 </li>
1222 <li>
1223 <p>
1225 </p>
1226 </li>
1227 <li>
1228 <p>
1229 a tab or a NUL when <em>-z</em> option is used.
1230 </p>
1231 </li>
1232 <li>
1233 <p>
1235 </p>
1236 </li>
1237 <li>
1238 <p>
1239 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1240 </p>
1241 </li>
1242 <li>
1243 <p>
1245 </p>
1246 </li>
1247 <li>
1248 <p>
1249 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1250 </p>
1251 </li>
1252 </ol></div>
1255 <li>
1256 <p>
1257 A: addition of a file
1258 </p>
1259 </li>
1260 <li>
1261 <p>
1262 C: copy of a file into a new one
1263 </p>
1264 </li>
1265 <li>
1266 <p>
1267 D: deletion of a file
1268 </p>
1269 </li>
1270 <li>
1271 <p>
1272 M: modification of the contents or mode of a file
1273 </p>
1274 </li>
1275 <li>
1276 <p>
1277 R: renaming of a file
1278 </p>
1279 </li>
1280 <li>
1281 <p>
1282 T: change in the type of the file
1283 </p>
1284 </li>
1285 <li>
1286 <p>
1287 U: file is unmerged (you must complete the merge before it can
1288 be committed)
1289 </p>
1290 </li>
1291 <li>
1292 <p>
1294 </p>
1295 </li>
1296 </ul></div>
1298 percentage of similarity between the source and target of the move or
1299 copy), and are the only ones to be so.</p></div>
1300 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1301 and it is out of sync with the index.</p></div>
1305 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1306 </div></div>
1307 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1308 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1309 respectively.</p></div>
1310 </div>
1314 can take <em>-c</em> or <em>--cc</em> option
1315 to generate diff output also for merge commits. The output differs
1316 from the format described above in the following way:</p></div>
1318 <li>
1319 <p>
1320 there is a colon for each parent
1321 </p>
1322 </li>
1323 <li>
1324 <p>
1326 </p>
1327 </li>
1328 <li>
1329 <p>
1330 status is concatenated status characters for each parent
1331 </p>
1332 </li>
1333 <li>
1334 <p>
1336 </p>
1337 </li>
1338 <li>
1339 <p>
1341 </p>
1342 </li>
1343 </ol></div>
1347 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1348 </div></div>
1349 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1350 all parents.</p></div>
1351 </div>
1357 do not produce the output described above; instead they produce a
1358 patch file. You can customize the creation of such patches via the
1359 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1360 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1361 diff format:</p></div>
1363 <li>
1364 <p>
1366 </p>
1369 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1370 </div></div>
1371 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1372 involved. Especially, even for a creation or a deletion,
1373 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1374 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1375 name of the source file of the rename/copy and the name of
1376 the file that rename/copy produces, respectively.</p></div>
1377 </li>
1378 <li>
1379 <p>
1380 It is followed by one or more extended header lines:
1381 </p>
1384 <pre><tt>old mode <mode>
1385 new mode <mode>
1386 deleted file mode <mode>
1387 new file mode <mode>
1388 copy from <path>
1389 copy to <path>
1390 rename from <path>
1391 rename to <path>
1392 similarity index <number>
1393 dissimilarity index <number>
1394 index <hash>..<hash> <mode></tt></pre>
1395 </div></div>
1396 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1397 and file permission bits.</p></div>
1398 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1400 the dissimilarity index is the percentage of changed lines. It
1401 is a rounded down integer, followed by a percent sign. The
1402 similarity index value of 100% is thus reserved for two equal
1403 files, while 100% dissimilarity means that no line from the old
1404 file made it into the new one.</p></div>
1405 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1406 The <mode> is included if the file mode does not change; otherwise,
1407 separate lines indicate the old and the new mode.</p></div>
1408 </li>
1409 <li>
1410 <p>
1411 TAB, LF, double quote and backslash characters in pathnames
1413 If there is need for such substitution then the whole
1414 pathname is put in double quotes.
1415 </p>
1416 </li>
1417 <li>
1418 <p>
1421 It is incorrect to apply each change to each file sequentially. For
1422 example, this patch will swap a and b:
1423 </p>
1426 <pre><tt>diff --git a/a b/b
1427 rename from a
1428 rename to b
1429 diff --git a/b b/a
1430 rename from b
1431 rename to a</tt></pre>
1432 </div></div>
1433 </li>
1434 </ol></div>
1435 </div>
1438 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1441 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1442 of these commands to force generation of diffs with individual parents
1443 of a merge.</p></div>
1447 <pre><tt>diff --combined describe.c
1448 index fabadb8,cc95eb0..4866510
1449 --- a/describe.c
1450 +++ b/describe.c
1453 }
1455 - static void describe(char *arg)
1456 -static void describe(struct commit *cmit, int last_one)
1457 ++static void describe(char *arg, int last_one)
1458 {
1459 + unsigned char sha1[20];
1460 + struct commit *cmit;
1461 struct commit_list *list;
1462 static int initialized = 0;
1463 struct commit_name *n;
1466 + usage(describe_usage);
1467 + cmit = lookup_commit_reference(sha1);
1468 + if (!cmit)
1469 + usage(describe_usage);
1470 +
1471 if (!initialized) {
1472 initialized = 1;
1473 for_each_ref(get_name);</tt></pre>
1474 </div></div>
1476 <li>
1477 <p>
1478 It is preceded with a "git diff" header, that looks like
1480 </p>
1484 </div></div>
1489 </div></div>
1490 </li>
1491 <li>
1492 <p>
1493 It is followed by one or more extended header lines
1494 (this example shows a merge with two parents):
1495 </p>
1502 </div></div>
1503 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1505 information about detected contents movement (renames and
1506 copying detection) are designed to work with diff of two
1508 </li>
1509 <li>
1510 <p>
1511 It is followed by two-line from-file/to-file header
1512 </p>
1515 <pre><tt>--- a/file
1516 +++ b/file</tt></pre>
1517 </div></div>
1520 files.</p></div>
1521 </li>
1522 <li>
1523 <p>
1524 Chunk header format is modified to prevent people from
1526 was created for review of merge commit changes, and was not
1527 meant for apply. The change is similar to the change in the
1529 </p>
1532 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1533 </div></div>
1535 header for combined diff format.</p></div>
1536 </li>
1537 </ol></div>
1539 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
1541 compares two or more files file1, file2,… with one file X, and
1542 shows how X differs from each of fileN. One column for each of
1543 fileN is prepended to the output line to note how X’s line is
1544 different from it.</p></div>
1545 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1547 in the column N means that the line appears in the result,
1548 and fileN does not have that line (in other words, the line was
1549 added, from the point of view of that parent).</p></div>
1553 in either file1 nor file2). Also eight other lines are the same
1555 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1556 merge commit with the merge result (i.e. file1..fileN are the
1558 two unresolved merge parents with the working tree file
1561 </div>
1564 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1566 output. These options can be combined with other options, such as
1568 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1569 formats the pathnames compactly by combining common prefix and suffix of
1575 </div></div>
1576 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1578 like this:</p></div>
1583 </div></div>
1586 <li>
1587 <p>
1588 the number of added lines;
1589 </p>
1590 </li>
1591 <li>
1592 <p>
1593 a tab;
1594 </p>
1595 </li>
1596 <li>
1597 <p>
1598 the number of deleted lines;
1599 </p>
1600 </li>
1601 <li>
1602 <p>
1603 a tab;
1604 </p>
1605 </li>
1606 <li>
1607 <p>
1608 pathname (possibly with rename/copy information);
1609 </p>
1610 </li>
1611 <li>
1612 <p>
1613 a newline.
1614 </p>
1615 </li>
1616 </ol></div>
1617 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1622 </div></div>
1625 <li>
1626 <p>
1627 the number of added lines;
1628 </p>
1629 </li>
1630 <li>
1631 <p>
1632 a tab;
1633 </p>
1634 </li>
1635 <li>
1636 <p>
1637 the number of deleted lines;
1638 </p>
1639 </li>
1640 <li>
1641 <p>
1642 a tab;
1643 </p>
1644 </li>
1645 <li>
1646 <p>
1647 a NUL (only exists if renamed/copied);
1648 </p>
1649 </li>
1650 <li>
1651 <p>
1652 pathname in preimage;
1653 </p>
1654 </li>
1655 <li>
1656 <p>
1657 a NUL (only exists if renamed/copied);
1658 </p>
1659 </li>
1660 <li>
1661 <p>
1662 pathname in postimage (only exists if renamed/copied);
1663 </p>
1664 </li>
1665 <li>
1666 <p>
1667 a NUL.
1668 </p>
1669 </li>
1670 </ol></div>
1671 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1672 scripts that read the output to tell if the current record being read is
1673 a single-path record or a rename/copy record without reading ahead.
1676 </div>
1680 </div>
1684 </div>
1685 </div>
1686 </body>
1687 </html>