| blob | 70a06e178722e30c78e55cc0861e1100b7526dd4 |
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>
418 <div class="verseblock-content"><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</div>
420 </div></div>
421 </div>
425 are specified, compares only those named paths. Otherwise all
426 entries in the index are compared. The output format is the
428 </div>
433 -p
434 </dt>
436 -u
437 </dt>
439 --patch
440 </dt>
441 <dd>
442 <p>
443 Generate patch (see section on generating patches).
445 </p>
446 </dd>
449 </dt>
452 </dt>
453 <dd>
454 <p>
456 the usual three.
458 </p>
459 </dd>
461 --raw
462 </dt>
463 <dd>
464 <p>
465 Generate the raw format.
466 This is the default.
467 </p>
468 </dd>
470 --patch-with-raw
471 </dt>
472 <dd>
473 <p>
475 </p>
476 </dd>
478 --patience
479 </dt>
480 <dd>
481 <p>
482 Generate a diff using the "patience diff" algorithm.
483 </p>
484 </dd>
487 </dt>
488 <dd>
489 <p>
490 Generate a diffstat. You can override the default
492 The width of the filename part can be controlled by
493 giving another width to it separated by a comma.
497 </p>
498 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
499 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
500 </dd>
502 --numstat
503 </dt>
504 <dd>
505 <p>
507 deleted lines in decimal notation and pathname without
508 abbreviation, to make it more machine friendly. For
511 </p>
512 </dd>
514 --shortstat
515 </dt>
516 <dd>
517 <p>
519 number of modified files, as well as number of added and deleted
520 lines.
521 </p>
522 </dd>
525 </dt>
526 <dd>
527 <p>
528 Output the distribution of relative amount of changes for each
530 passing it a comma separated list of parameters.
533 The following parameters are available:
534 </p>
538 </dt>
539 <dd>
540 <p>
541 Compute the dirstat numbers by counting the lines that have been
542 removed from the source, or added to the destination. This ignores
543 the amount of pure code movements within a file. In other words,
544 rearranging lines in a file is not counted as much as other changes.
545 This is the default behavior when no parameter is given.
546 </p>
547 </dd>
550 </dt>
551 <dd>
552 <p>
553 Compute the dirstat numbers by doing the regular line-based diff
554 analysis, and summing the removed/added line counts. (For binary
555 files, count 64-byte chunks instead, since binary files have no
558 lines within a file as much as other changes. The resulting output
560 </p>
561 </dd>
564 </dt>
565 <dd>
566 <p>
567 Compute the dirstat numbers by counting the number of files changed.
568 Each changed file counts equally in the dirstat analysis. This is
570 not have to look at the file contents at all.
571 </p>
572 </dd>
575 </dt>
576 <dd>
577 <p>
578 Count changes in a child directory for the parent directory as well.
580 reported may exceed 100%. The default (non-cumulative) behavior can
582 </p>
583 </dd>
586 </dt>
587 <dd>
588 <p>
589 An integer parameter specifies a cut-off percent (3% by default).
590 Directories contributing less than this percentage of the changes
591 are not shown in the output.
592 </p>
593 </dd>
594 </dl></div>
596 directories with less than 10% of the total amount of changed files,
597 and accumulating child directory counts in the parent directories:
599 </dd>
601 --summary
602 </dt>
603 <dd>
604 <p>
605 Output a condensed summary of extended header information
606 such as creations, renames and mode changes.
607 </p>
608 </dd>
610 --patch-with-stat
611 </dt>
612 <dd>
613 <p>
615 </p>
616 </dd>
618 -z
619 </dt>
620 <dd>
621 <p>
622 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
623 given, do not munge pathnames and use NULs as output field terminators.
624 </p>
625 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
627 respectively, and the pathname will be enclosed in double quotes if
628 any of those replacements occurred.</p></div>
629 </dd>
631 --name-only
632 </dt>
633 <dd>
634 <p>
635 Show only names of changed files.
636 </p>
637 </dd>
639 --name-status
640 </dt>
641 <dd>
642 <p>
643 Show only names and status of changed files. See the description
644 of the <tt>--diff-filter</tt> option on what the status letters mean.
645 </p>
646 </dd>
648 --submodule[=<format>]
649 </dt>
650 <dd>
651 <p>
652 Chose the output format for submodule differences. <format> can be one of
653 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
654 is used when this option is not given. <em>log</em> is the default value for this
655 option and lists the commits in that commit range like the <em>summary</em>
657 </p>
658 </dd>
660 --color[=<when>]
661 </dt>
662 <dd>
663 <p>
664 Show colored diff.
665 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
666 The default value is <tt>never</tt>.
667 </p>
668 </dd>
670 --no-color
671 </dt>
672 <dd>
673 <p>
674 Turn off colored diff.
675 It is the same as <tt>--color=never</tt>.
676 </p>
677 </dd>
679 --word-diff[=<mode>]
680 </dt>
681 <dd>
682 <p>
683 Show a word diff, using the <mode> to delimit changed words.
684 By default, words are delimited by whitespace; see
685 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
686 must be one of:
687 </p>
690 color
691 </dt>
692 <dd>
693 <p>
694 Highlight changed words using only colors. Implies <tt>--color</tt>.
695 </p>
696 </dd>
698 plain
699 </dt>
700 <dd>
701 <p>
702 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
703 attempts to escape the delimiters if they appear in the input,
704 so the output may be ambiguous.
705 </p>
706 </dd>
708 porcelain
709 </dt>
710 <dd>
711 <p>
712 Use a special line-based format intended for script
713 consumption. Added/removed/unchanged runs are printed in the
714 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
715 character at the beginning of the line and extending to the
716 end of the line. Newlines in the input are represented by a
717 tilde <tt>~</tt> on a line of its own.
718 </p>
719 </dd>
721 none
722 </dt>
723 <dd>
724 <p>
725 Disable word diff again.
726 </p>
727 </dd>
728 </dl></div>
730 highlight the changed parts in all modes if enabled.</p></div>
731 </dd>
733 --word-diff-regex=<regex>
734 </dt>
735 <dd>
736 <p>
737 Use <regex> to decide what a word is, instead of considering
738 runs of non-whitespace to be a word. Also implies
739 <tt>--word-diff</tt> unless it was already enabled.
740 </p>
742 <regex> is considered a word. Anything between these matches is
743 considered whitespace and ignored(!) for the purposes of finding
744 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
745 expression to make sure that it matches all non-whitespace characters.
746 A match that contains a newline is silently truncated(!) at the
747 newline.</p></div>
748 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
749 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
750 overrides any diff driver or configuration setting. Diff drivers
751 override configuration settings.</p></div>
752 </dd>
754 --color-words[=<regex>]
755 </dt>
756 <dd>
757 <p>
758 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
759 specified) <tt>--word-diff-regex=<regex></tt>.
760 </p>
761 </dd>
763 --no-renames
764 </dt>
765 <dd>
766 <p>
767 Turn off rename detection, even when the configuration
768 file gives the default to do so.
769 </p>
770 </dd>
772 --check
773 </dt>
774 <dd>
775 <p>
776 Warn if changes introduce whitespace errors. What are
777 considered whitespace errors is controlled by <tt>core.whitespace</tt>
778 configuration. By default, trailing whitespaces (including
779 lines that solely consist of whitespaces) and a space character
780 that is immediately followed by a tab character inside the
781 initial indent of the line are considered whitespace errors.
782 Exits with non-zero status if problems are found. Not compatible
783 with --exit-code.
784 </p>
785 </dd>
787 --full-index
788 </dt>
789 <dd>
790 <p>
791 Instead of the first handful of characters, show the full
793 line when generating patch format output.
794 </p>
795 </dd>
797 --binary
798 </dt>
799 <dd>
800 <p>
801 In addition to <tt>--full-index</tt>, output a binary diff that
802 can be applied with <tt>git-apply</tt>.
803 </p>
804 </dd>
806 --abbrev[=<n>]
807 </dt>
808 <dd>
809 <p>
810 Instead of showing the full 40-byte hexadecimal object
811 name in diff-raw format output and diff-tree header
812 lines, show only a partial prefix. This is
813 independent of the <tt>--full-index</tt> option above, which controls
814 the diff-patch output format. Non default number of
815 digits can be specified with <tt>--abbrev=<n></tt>.
816 </p>
817 </dd>
819 -B[<n>][/<m>]
820 </dt>
822 --break-rewrites[=[<n>][/<m>]]
823 </dt>
824 <dd>
825 <p>
826 Break complete rewrite changes into pairs of delete and
827 create. This serves two purposes:
828 </p>
830 not as a series of deletion and insertion mixed together with a very
831 few lines that happen to match textually as the context, but as a
832 single deletion of everything old followed by a single insertion of
833 everything new, and the number <tt>m</tt> controls this aspect of the -B
834 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
835 original should remain in the result for git to consider it a total
836 rewrite (i.e. otherwise the resulting patch will be a series of
837 deletion and insertion mixed together with context lines).</p></div>
839 source of a rename (usually -M only considers a file that disappeared
840 as the source of a rename), and the number <tt>n</tt> controls this aspect of
841 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
842 addition and deletion compared to 20% or more of the file’s size are
843 eligible for being picked up as a possible source of a rename to
844 another file.</p></div>
845 </dd>
847 -M[<n>]
848 </dt>
850 --find-renames[=<n>]
851 </dt>
852 <dd>
853 <p>
854 Detect renames.
855 If <tt>n</tt> is specified, it is a threshold on the similarity
856 index (i.e. amount of addition/deletions compared to the
857 file’s size). For example, <tt>-M90%</tt> means git should consider a
858 delete/add pair to be a rename if more than 90% of the file
859 hasn’t changed.
860 </p>
861 </dd>
863 -C[<n>]
864 </dt>
866 --find-copies[=<n>]
867 </dt>
868 <dd>
869 <p>
870 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
871 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
872 </p>
873 </dd>
875 --find-copies-harder
876 </dt>
877 <dd>
878 <p>
879 For performance reasons, by default, <tt>-C</tt> option finds copies only
880 if the original file of the copy was modified in the same
881 changeset. This flag makes the command
882 inspect unmodified files as candidates for the source of
883 copy. This is a very expensive operation for large
884 projects, so use it with caution. Giving more than one
885 <tt>-C</tt> option has the same effect.
886 </p>
887 </dd>
889 -D
890 </dt>
892 --irreversible-delete
893 </dt>
894 <dd>
895 <p>
896 Omit the preimage for deletes, i.e. print only the header but not
897 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
898 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
899 solely for people who want to just concentrate on reviewing the
900 text after the change. In addition, the output obviously lack
901 enough information to apply such a patch in reverse, even manually,
902 hence the name of the option.
903 </p>
904 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
905 of a delete/create pair.</p></div>
906 </dd>
908 -l<num>
909 </dt>
910 <dd>
911 <p>
912 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
913 is the number of potential rename/copy targets. This
914 option prevents rename/copy detection from running if
915 the number of rename/copy targets exceeds the specified
916 number.
917 </p>
918 </dd>
920 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
921 </dt>
922 <dd>
923 <p>
924 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
925 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
926 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
927 are Unmerged (<tt>U</tt>), are
928 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
929 Any combination of the filter characters (including none) can be used.
930 When <tt>*</tt> (All-or-none) is added to the combination, all
931 paths are selected if there is any file that matches
932 other criteria in the comparison; if there is no file
933 that matches other criteria, nothing is selected.
934 </p>
935 </dd>
937 -S<string>
938 </dt>
939 <dd>
940 <p>
941 Look for differences that introduce or remove an instance of
942 <string>. Note that this is different than the string simply
943 appearing in diff output; see the <em>pickaxe</em> entry in
945 </p>
946 </dd>
948 -G<regex>
949 </dt>
950 <dd>
951 <p>
952 Look for differences whose added or removed line matches
953 the given <regex>.
954 </p>
955 </dd>
957 --pickaxe-all
958 </dt>
959 <dd>
960 <p>
961 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
962 changeset, not just the files that contain the change
963 in <string>.
964 </p>
965 </dd>
967 --pickaxe-regex
968 </dt>
969 <dd>
970 <p>
971 Make the <string> not a plain string but an extended POSIX
972 regex to match.
973 </p>
974 </dd>
976 -O<orderfile>
977 </dt>
978 <dd>
979 <p>
980 Output the patch in the order specified in the
981 <orderfile>, which has one shell glob pattern per line.
982 </p>
983 </dd>
985 -R
986 </dt>
987 <dd>
988 <p>
989 Swap two inputs; that is, show differences from index or
990 on-disk file to tree contents.
991 </p>
992 </dd>
994 --relative[=<path>]
995 </dt>
996 <dd>
997 <p>
998 When run from a subdirectory of the project, it can be
999 told to exclude changes outside the directory and show
1000 pathnames relative to it with this option. When you are
1001 not in a subdirectory (e.g. in a bare repository), you
1002 can name which subdirectory to make the output relative
1003 to by giving a <path> as an argument.
1004 </p>
1005 </dd>
1007 -a
1008 </dt>
1010 --text
1011 </dt>
1012 <dd>
1013 <p>
1014 Treat all files as text.
1015 </p>
1016 </dd>
1018 --ignore-space-at-eol
1019 </dt>
1020 <dd>
1021 <p>
1022 Ignore changes in whitespace at EOL.
1023 </p>
1024 </dd>
1026 -b
1027 </dt>
1029 --ignore-space-change
1030 </dt>
1031 <dd>
1032 <p>
1033 Ignore changes in amount of whitespace. This ignores whitespace
1034 at line end, and considers all other sequences of one or
1035 more whitespace characters to be equivalent.
1036 </p>
1037 </dd>
1039 -w
1040 </dt>
1042 --ignore-all-space
1043 </dt>
1044 <dd>
1045 <p>
1046 Ignore whitespace when comparing lines. This ignores
1047 differences even if one line has whitespace where the other
1048 line has none.
1049 </p>
1050 </dd>
1052 --inter-hunk-context=<lines>
1053 </dt>
1054 <dd>
1055 <p>
1056 Show the context between diff hunks, up to the specified number
1057 of lines, thereby fusing hunks that are close to each other.
1058 </p>
1059 </dd>
1061 --exit-code
1062 </dt>
1063 <dd>
1064 <p>
1065 Make the program exit with codes similar to diff(1).
1066 That is, it exits with 1 if there were differences and
1067 0 means no differences.
1068 </p>
1069 </dd>
1071 --quiet
1072 </dt>
1073 <dd>
1074 <p>
1075 Disable all output of the program. Implies <tt>--exit-code</tt>.
1076 </p>
1077 </dd>
1079 --ext-diff
1080 </dt>
1081 <dd>
1082 <p>
1083 Allow an external diff helper to be executed. If you set an
1086 </p>
1087 </dd>
1089 --no-ext-diff
1090 </dt>
1091 <dd>
1092 <p>
1093 Disallow external diff drivers.
1094 </p>
1095 </dd>
1097 --textconv
1098 </dt>
1100 --no-textconv
1101 </dt>
1102 <dd>
1103 <p>
1104 Allow (or disallow) external text conversion filters to be run
1106 details. Because textconv filters are typically a one-way
1107 conversion, the resulting diff is suitable for human
1108 consumption, but cannot be applied. For this reason, textconv
1110 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1111 diff plumbing commands.
1112 </p>
1113 </dd>
1115 --ignore-submodules[=<when>]
1116 </dt>
1117 <dd>
1118 <p>
1119 Ignore changes to submodules in the diff generation. <when> can be
1122 untracked or modified files or its HEAD differs from the commit recorded
1123 in the superproject and can be used to override any settings of the
1124 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1126 contain untracked content (but they are still scanned for modified
1128 only changes to the commits stored in the superproject are shown (this was
1130 </p>
1131 </dd>
1133 --src-prefix=<prefix>
1134 </dt>
1135 <dd>
1136 <p>
1138 </p>
1139 </dd>
1141 --dst-prefix=<prefix>
1142 </dt>
1143 <dd>
1144 <p>
1146 </p>
1147 </dd>
1149 --no-prefix
1150 </dt>
1151 <dd>
1152 <p>
1153 Do not show any source or destination prefix.
1154 </p>
1155 </dd>
1156 </dl></div>
1161 -1 --base
1162 </dt>
1164 -2 --ours
1165 </dt>
1167 -3 --theirs
1168 </dt>
1170 -0
1171 </dt>
1172 <dd>
1173 <p>
1175 branch" respectively. With these options, diffs for
1176 merged entries are not shown.
1177 </p>
1179 cleanly resolved paths. The option -0 can be given to
1181 </dd>
1183 -c
1184 </dt>
1186 --cc
1187 </dt>
1188 <dd>
1189 <p>
1190 This compares stage 2 (our branch), stage 3 (their
1191 branch) and the working tree file and outputs a combined
1192 diff, similar to the way <em>diff-tree</em> shows a merge
1193 commit with these flags.
1194 </p>
1195 </dd>
1197 -q
1198 </dt>
1199 <dd>
1200 <p>
1201 Remain silent even on nonexistent files
1202 </p>
1203 </dd>
1204 </dl></div>
1205 </div>
1211 compared differs:</p></div>
1214 git-diff-index <tree-ish>
1215 </dt>
1216 <dd>
1217 <p>
1218 compares the <tree-ish> and the files on the filesystem.
1219 </p>
1220 </dd>
1222 git-diff-index --cached <tree-ish>
1223 </dt>
1224 <dd>
1225 <p>
1226 compares the <tree-ish> and the index.
1227 </p>
1228 </dd>
1230 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1231 </dt>
1232 <dd>
1233 <p>
1234 compares the trees named by the two arguments.
1235 </p>
1236 </dd>
1238 git-diff-files [<pattern>…]
1239 </dt>
1240 <dd>
1241 <p>
1242 compares the index and the files on the filesystem.
1243 </p>
1244 </dd>
1245 </dl></div>
1246 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1247 what is being compared. After that, all the commands print one output
1248 line per changed file.</p></div>
1252 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1253 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1254 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1255 create :000000 100644 0000000... 1234567... A file4
1256 delete :100644 000000 1234567... 0000000... D file5
1257 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1258 </div></div>
1261 <li>
1262 <p>
1263 a colon.
1264 </p>
1265 </li>
1266 <li>
1267 <p>
1269 </p>
1270 </li>
1271 <li>
1272 <p>
1273 a space.
1274 </p>
1275 </li>
1276 <li>
1277 <p>
1279 </p>
1280 </li>
1281 <li>
1282 <p>
1283 a space.
1284 </p>
1285 </li>
1286 <li>
1287 <p>
1289 </p>
1290 </li>
1291 <li>
1292 <p>
1293 a space.
1294 </p>
1295 </li>
1296 <li>
1297 <p>
1299 </p>
1300 </li>
1301 <li>
1302 <p>
1303 a space.
1304 </p>
1305 </li>
1306 <li>
1307 <p>
1309 </p>
1310 </li>
1311 <li>
1312 <p>
1313 a tab or a NUL when <em>-z</em> option is used.
1314 </p>
1315 </li>
1316 <li>
1317 <p>
1319 </p>
1320 </li>
1321 <li>
1322 <p>
1323 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1324 </p>
1325 </li>
1326 <li>
1327 <p>
1329 </p>
1330 </li>
1331 <li>
1332 <p>
1333 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1334 </p>
1335 </li>
1336 </ol></div>
1339 <li>
1340 <p>
1341 A: addition of a file
1342 </p>
1343 </li>
1344 <li>
1345 <p>
1346 C: copy of a file into a new one
1347 </p>
1348 </li>
1349 <li>
1350 <p>
1351 D: deletion of a file
1352 </p>
1353 </li>
1354 <li>
1355 <p>
1356 M: modification of the contents or mode of a file
1357 </p>
1358 </li>
1359 <li>
1360 <p>
1361 R: renaming of a file
1362 </p>
1363 </li>
1364 <li>
1365 <p>
1366 T: change in the type of the file
1367 </p>
1368 </li>
1369 <li>
1370 <p>
1371 U: file is unmerged (you must complete the merge before it can
1372 be committed)
1373 </p>
1374 </li>
1375 <li>
1376 <p>
1378 </p>
1379 </li>
1380 </ul></div>
1382 percentage of similarity between the source and target of the move or
1383 copy), and are the only ones to be so.</p></div>
1384 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1385 and it is out of sync with the index.</p></div>
1389 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1390 </div></div>
1391 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1392 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1393 respectively.</p></div>
1394 </div>
1398 can take <em>-c</em> or <em>--cc</em> option
1399 to generate diff output also for merge commits. The output differs
1400 from the format described above in the following way:</p></div>
1402 <li>
1403 <p>
1404 there is a colon for each parent
1405 </p>
1406 </li>
1407 <li>
1408 <p>
1410 </p>
1411 </li>
1412 <li>
1413 <p>
1414 status is concatenated status characters for each parent
1415 </p>
1416 </li>
1417 <li>
1418 <p>
1420 </p>
1421 </li>
1422 <li>
1423 <p>
1425 </p>
1426 </li>
1427 </ol></div>
1431 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1432 </div></div>
1433 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1434 all parents.</p></div>
1435 </div>
1441 do not produce the output described above; instead they produce a
1442 patch file. You can customize the creation of such patches via the
1443 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1444 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1445 diff format:</p></div>
1447 <li>
1448 <p>
1450 </p>
1453 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1454 </div></div>
1455 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1456 involved. Especially, even for a creation or a deletion,
1457 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1458 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1459 name of the source file of the rename/copy and the name of
1460 the file that rename/copy produces, respectively.</p></div>
1461 </li>
1462 <li>
1463 <p>
1464 It is followed by one or more extended header lines:
1465 </p>
1468 <pre><tt>old mode <mode>
1469 new mode <mode>
1470 deleted file mode <mode>
1471 new file mode <mode>
1472 copy from <path>
1473 copy to <path>
1474 rename from <path>
1475 rename to <path>
1476 similarity index <number>
1477 dissimilarity index <number>
1478 index <hash>..<hash> <mode></tt></pre>
1479 </div></div>
1480 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1481 and file permission bits.</p></div>
1482 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1484 the dissimilarity index is the percentage of changed lines. It
1485 is a rounded down integer, followed by a percent sign. The
1486 similarity index value of 100% is thus reserved for two equal
1487 files, while 100% dissimilarity means that no line from the old
1488 file made it into the new one.</p></div>
1489 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1490 The <mode> is included if the file mode does not change; otherwise,
1491 separate lines indicate the old and the new mode.</p></div>
1492 </li>
1493 <li>
1494 <p>
1495 TAB, LF, double quote and backslash characters in pathnames
1497 If there is need for such substitution then the whole
1498 pathname is put in double quotes.
1499 </p>
1500 </li>
1501 <li>
1502 <p>
1505 It is incorrect to apply each change to each file sequentially. For
1506 example, this patch will swap a and b:
1507 </p>
1510 <pre><tt>diff --git a/a b/b
1511 rename from a
1512 rename to b
1513 diff --git a/b b/a
1514 rename from b
1515 rename to a</tt></pre>
1516 </div></div>
1517 </li>
1518 </ol></div>
1519 </div>
1522 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1525 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1526 of these commands to force generation of diffs with individual parents
1527 of a merge.</p></div>
1531 <pre><tt>diff --combined describe.c
1532 index fabadb8,cc95eb0..4866510
1533 --- a/describe.c
1534 +++ b/describe.c
1537 }
1539 - static void describe(char *arg)
1540 -static void describe(struct commit *cmit, int last_one)
1541 ++static void describe(char *arg, int last_one)
1542 {
1543 + unsigned char sha1[20];
1544 + struct commit *cmit;
1545 struct commit_list *list;
1546 static int initialized = 0;
1547 struct commit_name *n;
1550 + usage(describe_usage);
1551 + cmit = lookup_commit_reference(sha1);
1552 + if (!cmit)
1553 + usage(describe_usage);
1554 +
1555 if (!initialized) {
1556 initialized = 1;
1557 for_each_ref(get_name);</tt></pre>
1558 </div></div>
1560 <li>
1561 <p>
1562 It is preceded with a "git diff" header, that looks like
1564 </p>
1568 </div></div>
1573 </div></div>
1574 </li>
1575 <li>
1576 <p>
1577 It is followed by one or more extended header lines
1578 (this example shows a merge with two parents):
1579 </p>
1586 </div></div>
1587 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1589 information about detected contents movement (renames and
1590 copying detection) are designed to work with diff of two
1592 </li>
1593 <li>
1594 <p>
1595 It is followed by two-line from-file/to-file header
1596 </p>
1599 <pre><tt>--- a/file
1600 +++ b/file</tt></pre>
1601 </div></div>
1604 files.</p></div>
1605 </li>
1606 <li>
1607 <p>
1608 Chunk header format is modified to prevent people from
1610 was created for review of merge commit changes, and was not
1611 meant for apply. The change is similar to the change in the
1613 </p>
1616 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1617 </div></div>
1619 header for combined diff format.</p></div>
1620 </li>
1621 </ol></div>
1623 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
1625 compares two or more files file1, file2,… with one file X, and
1626 shows how X differs from each of fileN. One column for each of
1627 fileN is prepended to the output line to note how X’s line is
1628 different from it.</p></div>
1629 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1631 in the column N means that the line appears in the result,
1632 and fileN does not have that line (in other words, the line was
1633 added, from the point of view of that parent).</p></div>
1637 in either file1 nor file2). Also eight other lines are the same
1639 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1640 merge commit with the merge result (i.e. file1..fileN are the
1642 two unresolved merge parents with the working tree file
1645 </div>
1648 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1650 output. These options can be combined with other options, such as
1652 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1653 formats the pathnames compactly by combining common prefix and suffix of
1659 </div></div>
1660 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1662 like this:</p></div>
1667 </div></div>
1670 <li>
1671 <p>
1672 the number of added lines;
1673 </p>
1674 </li>
1675 <li>
1676 <p>
1677 a tab;
1678 </p>
1679 </li>
1680 <li>
1681 <p>
1682 the number of deleted lines;
1683 </p>
1684 </li>
1685 <li>
1686 <p>
1687 a tab;
1688 </p>
1689 </li>
1690 <li>
1691 <p>
1692 pathname (possibly with rename/copy information);
1693 </p>
1694 </li>
1695 <li>
1696 <p>
1697 a newline.
1698 </p>
1699 </li>
1700 </ol></div>
1701 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1706 </div></div>
1709 <li>
1710 <p>
1711 the number of added lines;
1712 </p>
1713 </li>
1714 <li>
1715 <p>
1716 a tab;
1717 </p>
1718 </li>
1719 <li>
1720 <p>
1721 the number of deleted lines;
1722 </p>
1723 </li>
1724 <li>
1725 <p>
1726 a tab;
1727 </p>
1728 </li>
1729 <li>
1730 <p>
1731 a NUL (only exists if renamed/copied);
1732 </p>
1733 </li>
1734 <li>
1735 <p>
1736 pathname in preimage;
1737 </p>
1738 </li>
1739 <li>
1740 <p>
1741 a NUL (only exists if renamed/copied);
1742 </p>
1743 </li>
1744 <li>
1745 <p>
1746 pathname in postimage (only exists if renamed/copied);
1747 </p>
1748 </li>
1749 <li>
1750 <p>
1751 a NUL.
1752 </p>
1753 </li>
1754 </ol></div>
1755 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1756 scripts that read the output to tell if the current record being read is
1757 a single-path record or a rename/copy record without reading ahead.
1760 </div>
1764 </div>
1768 </div>
1769 </div>
1770 </body>
1771 </html>