| blob | f33a7aaf9d721bfd8e4bbed5e476ff0075765013 |
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(1) Manual Page
407 </h1>
410 <p>git-diff -
411 Show changes between commits, commit and working tree, etc
412 </p>
413 </div>
414 </div>
418 <div class="verseblock-content"><em>git diff</em> [options] [<commit>] [--] [<path>…]
423 </div></div>
424 </div>
427 <div class="paragraph"><p>Show changes between the working tree and the index or a tree, changes
428 between the index and a tree, changes between two trees, or changes
429 between two files on disk.</p></div>
433 </dt>
434 <dd>
435 <p>
436 This form is to view the changes you made relative to
437 the index (staging area for the next commit). In other
439 further add to the index but you still haven’t. You can
441 </p>
444 directories. This behavior can be forced by --no-index.</p></div>
445 </dd>
448 </dt>
449 <dd>
450 <p>
451 This form is to view the changes you staged for the next
453 would want comparison with the latest commit, so if you
455 If HEAD does not exist (e.g. unborned branches) and
457 --staged is a synonym of --cached.
458 </p>
459 </dd>
462 </dt>
463 <dd>
464 <p>
465 This form is to view the changes you have in your
467 use HEAD to compare it with the latest commit, or a
468 branch name to compare with the tip of a different
469 branch.
470 </p>
471 </dd>
474 </dt>
475 <dd>
476 <p>
477 This is to view the changes between two arbitrary
479 </p>
480 </dd>
483 </dt>
484 <dd>
485 <p>
487 one side is omitted, it will have the same effect as
488 using HEAD instead.
489 </p>
490 </dd>
493 </dt>
494 <dd>
495 <p>
496 This form is to view the changes on the branch containing
499 "git diff $(git-merge-base A B) B". You can omit any one
501 </p>
502 </dd>
503 </dl></div>
506 in the last two forms that use ".." notations, can be any
512 and the range notations ("<commit>..<commit>" and
513 "<commit>...<commit>") do not mean a range as defined in the
515 </div>
520 -p
521 </dt>
523 -u
524 </dt>
526 --patch
527 </dt>
528 <dd>
529 <p>
530 Generate patch (see section on generating patches).
531 This is the default.
532 </p>
533 </dd>
536 </dt>
539 </dt>
540 <dd>
541 <p>
543 the usual three.
545 </p>
546 </dd>
548 --raw
549 </dt>
550 <dd>
551 <p>
552 Generate the raw format.
554 </p>
555 </dd>
557 --patch-with-raw
558 </dt>
559 <dd>
560 <p>
562 </p>
563 </dd>
565 --patience
566 </dt>
567 <dd>
568 <p>
569 Generate a diff using the "patience diff" algorithm.
570 </p>
571 </dd>
574 </dt>
575 <dd>
576 <p>
577 Generate a diffstat. You can override the default
579 The width of the filename part can be controlled by
580 giving another width to it separated by a comma.
581 </p>
582 </dd>
584 --numstat
585 </dt>
586 <dd>
587 <p>
589 deleted lines in decimal notation and pathname without
590 abbreviation, to make it more machine friendly. For
593 </p>
594 </dd>
596 --shortstat
597 </dt>
598 <dd>
599 <p>
601 number of modified files, as well as number of added and deleted
602 lines.
603 </p>
604 </dd>
607 </dt>
608 <dd>
609 <p>
610 Output the distribution of relative amount of changes for each
612 passing it a comma separated list of parameters.
615 The following parameters are available:
616 </p>
620 </dt>
621 <dd>
622 <p>
623 Compute the dirstat numbers by counting the lines that have been
624 removed from the source, or added to the destination. This ignores
625 the amount of pure code movements within a file. In other words,
626 rearranging lines in a file is not counted as much as other changes.
627 This is the default behavior when no parameter is given.
628 </p>
629 </dd>
632 </dt>
633 <dd>
634 <p>
635 Compute the dirstat numbers by doing the regular line-based diff
636 analysis, and summing the removed/added line counts. (For binary
637 files, count 64-byte chunks instead, since binary files have no
640 lines within a file as much as other changes. The resulting output
642 </p>
643 </dd>
646 </dt>
647 <dd>
648 <p>
649 Compute the dirstat numbers by counting the number of files changed.
650 Each changed file counts equally in the dirstat analysis. This is
652 not have to look at the file contents at all.
653 </p>
654 </dd>
657 </dt>
658 <dd>
659 <p>
660 Count changes in a child directory for the parent directory as well.
662 reported may exceed 100%. The default (non-cumulative) behavior can
664 </p>
665 </dd>
668 </dt>
669 <dd>
670 <p>
671 An integer parameter specifies a cut-off percent (3% by default).
672 Directories contributing less than this percentage of the changes
673 are not shown in the output.
674 </p>
675 </dd>
676 </dl></div>
678 directories with less than 10% of the total amount of changed files,
679 and accumulating child directory counts in the parent directories:
681 </dd>
683 --summary
684 </dt>
685 <dd>
686 <p>
687 Output a condensed summary of extended header information
688 such as creations, renames and mode changes.
689 </p>
690 </dd>
692 --patch-with-stat
693 </dt>
694 <dd>
695 <p>
697 </p>
698 </dd>
700 -z
701 </dt>
702 <dd>
703 <p>
704 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
705 given, do not munge pathnames and use NULs as output field terminators.
706 </p>
707 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
709 respectively, and the pathname will be enclosed in double quotes if
710 any of those replacements occurred.</p></div>
711 </dd>
713 --name-only
714 </dt>
715 <dd>
716 <p>
717 Show only names of changed files.
718 </p>
719 </dd>
721 --name-status
722 </dt>
723 <dd>
724 <p>
725 Show only names and status of changed files. See the description
726 of the <tt>--diff-filter</tt> option on what the status letters mean.
727 </p>
728 </dd>
730 --submodule[=<format>]
731 </dt>
732 <dd>
733 <p>
734 Chose the output format for submodule differences. <format> can be one of
735 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
736 is used when this option is not given. <em>log</em> is the default value for this
737 option and lists the commits in that commit range like the <em>summary</em>
739 </p>
740 </dd>
742 --color[=<when>]
743 </dt>
744 <dd>
745 <p>
746 Show colored diff.
747 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
748 The default value is <tt>never</tt>.
749 It can be changed by the <tt>color.ui</tt> and <tt>color.diff</tt>
750 configuration settings.
751 </p>
752 </dd>
754 --no-color
755 </dt>
756 <dd>
757 <p>
758 Turn off colored diff.
759 This can be used to override configuration settings.
760 It is the same as <tt>--color=never</tt>.
761 </p>
762 </dd>
764 --word-diff[=<mode>]
765 </dt>
766 <dd>
767 <p>
768 Show a word diff, using the <mode> to delimit changed words.
769 By default, words are delimited by whitespace; see
770 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
771 must be one of:
772 </p>
775 color
776 </dt>
777 <dd>
778 <p>
779 Highlight changed words using only colors. Implies <tt>--color</tt>.
780 </p>
781 </dd>
783 plain
784 </dt>
785 <dd>
786 <p>
787 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
788 attempts to escape the delimiters if they appear in the input,
789 so the output may be ambiguous.
790 </p>
791 </dd>
793 porcelain
794 </dt>
795 <dd>
796 <p>
797 Use a special line-based format intended for script
798 consumption. Added/removed/unchanged runs are printed in the
799 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
800 character at the beginning of the line and extending to the
801 end of the line. Newlines in the input are represented by a
802 tilde <tt>~</tt> on a line of its own.
803 </p>
804 </dd>
806 none
807 </dt>
808 <dd>
809 <p>
810 Disable word diff again.
811 </p>
812 </dd>
813 </dl></div>
815 highlight the changed parts in all modes if enabled.</p></div>
816 </dd>
818 --word-diff-regex=<regex>
819 </dt>
820 <dd>
821 <p>
822 Use <regex> to decide what a word is, instead of considering
823 runs of non-whitespace to be a word. Also implies
824 <tt>--word-diff</tt> unless it was already enabled.
825 </p>
827 <regex> is considered a word. Anything between these matches is
828 considered whitespace and ignored(!) for the purposes of finding
829 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
830 expression to make sure that it matches all non-whitespace characters.
831 A match that contains a newline is silently truncated(!) at the
832 newline.</p></div>
833 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
834 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
835 overrides any diff driver or configuration setting. Diff drivers
836 override configuration settings.</p></div>
837 </dd>
839 --color-words[=<regex>]
840 </dt>
841 <dd>
842 <p>
843 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
844 specified) <tt>--word-diff-regex=<regex></tt>.
845 </p>
846 </dd>
848 --no-renames
849 </dt>
850 <dd>
851 <p>
852 Turn off rename detection, even when the configuration
853 file gives the default to do so.
854 </p>
855 </dd>
857 --check
858 </dt>
859 <dd>
860 <p>
861 Warn if changes introduce trailing whitespace
862 or an indent that uses a space before a tab. Exits with
863 non-zero status if problems are found. Not compatible with
864 --exit-code.
865 </p>
866 </dd>
868 --full-index
869 </dt>
870 <dd>
871 <p>
872 Instead of the first handful of characters, show the full
874 line when generating patch format output.
875 </p>
876 </dd>
878 --binary
879 </dt>
880 <dd>
881 <p>
882 In addition to <tt>--full-index</tt>, output a binary diff that
883 can be applied with <tt>git-apply</tt>.
884 </p>
885 </dd>
887 --abbrev[=<n>]
888 </dt>
889 <dd>
890 <p>
891 Instead of showing the full 40-byte hexadecimal object
892 name in diff-raw format output and diff-tree header
893 lines, show only a partial prefix. This is
894 independent of the <tt>--full-index</tt> option above, which controls
895 the diff-patch output format. Non default number of
896 digits can be specified with <tt>--abbrev=<n></tt>.
897 </p>
898 </dd>
900 -B[<n>][/<m>]
901 </dt>
903 --break-rewrites[=[<n>][/<m>]]
904 </dt>
905 <dd>
906 <p>
907 Break complete rewrite changes into pairs of delete and
908 create. This serves two purposes:
909 </p>
911 not as a series of deletion and insertion mixed together with a very
912 few lines that happen to match textually as the context, but as a
913 single deletion of everything old followed by a single insertion of
914 everything new, and the number <tt>m</tt> controls this aspect of the -B
915 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
916 original should remain in the result for git to consider it a total
917 rewrite (i.e. otherwise the resulting patch will be a series of
918 deletion and insertion mixed together with context lines).</p></div>
920 source of a rename (usually -M only considers a file that disappeared
921 as the source of a rename), and the number <tt>n</tt> controls this aspect of
922 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
923 addition and deletion compared to 20% or more of the file’s size are
924 eligible for being picked up as a possible source of a rename to
925 another file.</p></div>
926 </dd>
928 -M[<n>]
929 </dt>
931 --find-renames[=<n>]
932 </dt>
933 <dd>
934 <p>
935 Detect renames.
936 If <tt>n</tt> is specified, it is a threshold on the similarity
937 index (i.e. amount of addition/deletions compared to the
938 file’s size). For example, <tt>-M90%</tt> means git should consider a
939 delete/add pair to be a rename if more than 90% of the file
940 hasn’t changed.
941 </p>
942 </dd>
944 -C[<n>]
945 </dt>
947 --find-copies[=<n>]
948 </dt>
949 <dd>
950 <p>
951 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
952 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
953 </p>
954 </dd>
956 --find-copies-harder
957 </dt>
958 <dd>
959 <p>
960 For performance reasons, by default, <tt>-C</tt> option finds copies only
961 if the original file of the copy was modified in the same
962 changeset. This flag makes the command
963 inspect unmodified files as candidates for the source of
964 copy. This is a very expensive operation for large
965 projects, so use it with caution. Giving more than one
966 <tt>-C</tt> option has the same effect.
967 </p>
968 </dd>
970 -D
971 </dt>
973 --irreversible-delete
974 </dt>
975 <dd>
976 <p>
977 Omit the preimage for deletes, i.e. print only the header but not
978 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
979 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
980 solely for people who want to just concentrate on reviewing the
981 text after the change. In addition, the output obviously lack
982 enough information to apply such a patch in reverse, even manually,
983 hence the name of the option.
984 </p>
985 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
986 of a delete/create pair.</p></div>
987 </dd>
989 -l<num>
990 </dt>
991 <dd>
992 <p>
993 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
994 is the number of potential rename/copy targets. This
995 option prevents rename/copy detection from running if
996 the number of rename/copy targets exceeds the specified
997 number.
998 </p>
999 </dd>
1001 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1002 </dt>
1003 <dd>
1004 <p>
1005 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
1006 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
1007 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
1008 are Unmerged (<tt>U</tt>), are
1009 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
1010 Any combination of the filter characters (including none) can be used.
1011 When <tt>*</tt> (All-or-none) is added to the combination, all
1012 paths are selected if there is any file that matches
1013 other criteria in the comparison; if there is no file
1014 that matches other criteria, nothing is selected.
1015 </p>
1016 </dd>
1018 -S<string>
1019 </dt>
1020 <dd>
1021 <p>
1022 Look for differences that introduce or remove an instance of
1023 <string>. Note that this is different than the string simply
1024 appearing in diff output; see the <em>pickaxe</em> entry in
1026 </p>
1027 </dd>
1029 -G<regex>
1030 </dt>
1031 <dd>
1032 <p>
1033 Look for differences whose added or removed line matches
1034 the given <regex>.
1035 </p>
1036 </dd>
1038 --pickaxe-all
1039 </dt>
1040 <dd>
1041 <p>
1042 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
1043 changeset, not just the files that contain the change
1044 in <string>.
1045 </p>
1046 </dd>
1048 --pickaxe-regex
1049 </dt>
1050 <dd>
1051 <p>
1052 Make the <string> not a plain string but an extended POSIX
1053 regex to match.
1054 </p>
1055 </dd>
1057 -O<orderfile>
1058 </dt>
1059 <dd>
1060 <p>
1061 Output the patch in the order specified in the
1062 <orderfile>, which has one shell glob pattern per line.
1063 </p>
1064 </dd>
1066 -R
1067 </dt>
1068 <dd>
1069 <p>
1070 Swap two inputs; that is, show differences from index or
1071 on-disk file to tree contents.
1072 </p>
1073 </dd>
1075 --relative[=<path>]
1076 </dt>
1077 <dd>
1078 <p>
1079 When run from a subdirectory of the project, it can be
1080 told to exclude changes outside the directory and show
1081 pathnames relative to it with this option. When you are
1082 not in a subdirectory (e.g. in a bare repository), you
1083 can name which subdirectory to make the output relative
1084 to by giving a <path> as an argument.
1085 </p>
1086 </dd>
1088 -a
1089 </dt>
1091 --text
1092 </dt>
1093 <dd>
1094 <p>
1095 Treat all files as text.
1096 </p>
1097 </dd>
1099 --ignore-space-at-eol
1100 </dt>
1101 <dd>
1102 <p>
1103 Ignore changes in whitespace at EOL.
1104 </p>
1105 </dd>
1107 -b
1108 </dt>
1110 --ignore-space-change
1111 </dt>
1112 <dd>
1113 <p>
1114 Ignore changes in amount of whitespace. This ignores whitespace
1115 at line end, and considers all other sequences of one or
1116 more whitespace characters to be equivalent.
1117 </p>
1118 </dd>
1120 -w
1121 </dt>
1123 --ignore-all-space
1124 </dt>
1125 <dd>
1126 <p>
1127 Ignore whitespace when comparing lines. This ignores
1128 differences even if one line has whitespace where the other
1129 line has none.
1130 </p>
1131 </dd>
1133 --inter-hunk-context=<lines>
1134 </dt>
1135 <dd>
1136 <p>
1137 Show the context between diff hunks, up to the specified number
1138 of lines, thereby fusing hunks that are close to each other.
1139 </p>
1140 </dd>
1142 --exit-code
1143 </dt>
1144 <dd>
1145 <p>
1146 Make the program exit with codes similar to diff(1).
1147 That is, it exits with 1 if there were differences and
1148 0 means no differences.
1149 </p>
1150 </dd>
1152 --quiet
1153 </dt>
1154 <dd>
1155 <p>
1156 Disable all output of the program. Implies <tt>--exit-code</tt>.
1157 </p>
1158 </dd>
1160 --ext-diff
1161 </dt>
1162 <dd>
1163 <p>
1164 Allow an external diff helper to be executed. If you set an
1167 </p>
1168 </dd>
1170 --no-ext-diff
1171 </dt>
1172 <dd>
1173 <p>
1174 Disallow external diff drivers.
1175 </p>
1176 </dd>
1178 --ignore-submodules[=<when>]
1179 </dt>
1180 <dd>
1181 <p>
1182 Ignore changes to submodules in the diff generation. <when> can be
1185 untracked or modified files or its HEAD differs from the commit recorded
1186 in the superproject and can be used to override any settings of the
1187 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1189 contain untracked content (but they are still scanned for modified
1191 only changes to the commits stored in the superproject are shown (this was
1193 </p>
1194 </dd>
1196 --src-prefix=<prefix>
1197 </dt>
1198 <dd>
1199 <p>
1201 </p>
1202 </dd>
1204 --dst-prefix=<prefix>
1205 </dt>
1206 <dd>
1207 <p>
1209 </p>
1210 </dd>
1212 --no-prefix
1213 </dt>
1214 <dd>
1215 <p>
1216 Do not show any source or destination prefix.
1217 </p>
1218 </dd>
1219 </dl></div>
1224 <path>…
1225 </dt>
1226 <dd>
1227 <p>
1228 The <paths> parameters, when given, are used to limit
1229 the diff to the named paths (you can give directory
1230 names and get diff for all files under them).
1231 </p>
1232 </dd>
1233 </dl></div>
1234 </div>
1240 compared differs:</p></div>
1243 git-diff-index <tree-ish>
1244 </dt>
1245 <dd>
1246 <p>
1247 compares the <tree-ish> and the files on the filesystem.
1248 </p>
1249 </dd>
1251 git-diff-index --cached <tree-ish>
1252 </dt>
1253 <dd>
1254 <p>
1255 compares the <tree-ish> and the index.
1256 </p>
1257 </dd>
1259 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1260 </dt>
1261 <dd>
1262 <p>
1263 compares the trees named by the two arguments.
1264 </p>
1265 </dd>
1267 git-diff-files [<pattern>…]
1268 </dt>
1269 <dd>
1270 <p>
1271 compares the index and the files on the filesystem.
1272 </p>
1273 </dd>
1274 </dl></div>
1275 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1276 what is being compared. After that, all the commands print one output
1277 line per changed file.</p></div>
1281 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1282 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1283 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1284 create :000000 100644 0000000... 1234567... A file4
1285 delete :100644 000000 1234567... 0000000... D file5
1286 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1287 </div></div>
1290 <li>
1291 <p>
1292 a colon.
1293 </p>
1294 </li>
1295 <li>
1296 <p>
1298 </p>
1299 </li>
1300 <li>
1301 <p>
1302 a space.
1303 </p>
1304 </li>
1305 <li>
1306 <p>
1308 </p>
1309 </li>
1310 <li>
1311 <p>
1312 a space.
1313 </p>
1314 </li>
1315 <li>
1316 <p>
1318 </p>
1319 </li>
1320 <li>
1321 <p>
1322 a space.
1323 </p>
1324 </li>
1325 <li>
1326 <p>
1328 </p>
1329 </li>
1330 <li>
1331 <p>
1332 a space.
1333 </p>
1334 </li>
1335 <li>
1336 <p>
1338 </p>
1339 </li>
1340 <li>
1341 <p>
1342 a tab or a NUL when <em>-z</em> option is used.
1343 </p>
1344 </li>
1345 <li>
1346 <p>
1348 </p>
1349 </li>
1350 <li>
1351 <p>
1352 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1353 </p>
1354 </li>
1355 <li>
1356 <p>
1358 </p>
1359 </li>
1360 <li>
1361 <p>
1362 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1363 </p>
1364 </li>
1365 </ol></div>
1368 <li>
1369 <p>
1370 A: addition of a file
1371 </p>
1372 </li>
1373 <li>
1374 <p>
1375 C: copy of a file into a new one
1376 </p>
1377 </li>
1378 <li>
1379 <p>
1380 D: deletion of a file
1381 </p>
1382 </li>
1383 <li>
1384 <p>
1385 M: modification of the contents or mode of a file
1386 </p>
1387 </li>
1388 <li>
1389 <p>
1390 R: renaming of a file
1391 </p>
1392 </li>
1393 <li>
1394 <p>
1395 T: change in the type of the file
1396 </p>
1397 </li>
1398 <li>
1399 <p>
1400 U: file is unmerged (you must complete the merge before it can
1401 be committed)
1402 </p>
1403 </li>
1404 <li>
1405 <p>
1407 </p>
1408 </li>
1409 </ul></div>
1411 percentage of similarity between the source and target of the move or
1412 copy), and are the only ones to be so.</p></div>
1413 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1414 and it is out of sync with the index.</p></div>
1418 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1419 </div></div>
1420 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1421 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1422 respectively.</p></div>
1423 </div>
1427 can take <em>-c</em> or <em>--cc</em> option
1428 to generate diff output also for merge commits. The output differs
1429 from the format described above in the following way:</p></div>
1431 <li>
1432 <p>
1433 there is a colon for each parent
1434 </p>
1435 </li>
1436 <li>
1437 <p>
1439 </p>
1440 </li>
1441 <li>
1442 <p>
1443 status is concatenated status characters for each parent
1444 </p>
1445 </li>
1446 <li>
1447 <p>
1449 </p>
1450 </li>
1451 <li>
1452 <p>
1454 </p>
1455 </li>
1456 </ol></div>
1460 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1461 </div></div>
1462 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1463 all parents.</p></div>
1464 </div>
1470 do not produce the output described above; instead they produce a
1471 patch file. You can customize the creation of such patches via the
1472 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1473 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1474 diff format:</p></div>
1476 <li>
1477 <p>
1479 </p>
1482 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1483 </div></div>
1484 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1485 involved. Especially, even for a creation or a deletion,
1486 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1487 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1488 name of the source file of the rename/copy and the name of
1489 the file that rename/copy produces, respectively.</p></div>
1490 </li>
1491 <li>
1492 <p>
1493 It is followed by one or more extended header lines:
1494 </p>
1497 <pre><tt>old mode <mode>
1498 new mode <mode>
1499 deleted file mode <mode>
1500 new file mode <mode>
1501 copy from <path>
1502 copy to <path>
1503 rename from <path>
1504 rename to <path>
1505 similarity index <number>
1506 dissimilarity index <number>
1507 index <hash>..<hash> <mode></tt></pre>
1508 </div></div>
1509 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1510 and file permission bits.</p></div>
1511 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1513 the dissimilarity index is the percentage of changed lines. It
1514 is a rounded down integer, followed by a percent sign. The
1515 similarity index value of 100% is thus reserved for two equal
1516 files, while 100% dissimilarity means that no line from the old
1517 file made it into the new one.</p></div>
1518 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1519 The <mode> is included if the file mode does not change; otherwise,
1520 separate lines indicate the old and the new mode.</p></div>
1521 </li>
1522 <li>
1523 <p>
1524 TAB, LF, double quote and backslash characters in pathnames
1526 If there is need for such substitution then the whole
1527 pathname is put in double quotes.
1528 </p>
1529 </li>
1530 <li>
1531 <p>
1534 It is incorrect to apply each change to each file sequentially. For
1535 example, this patch will swap a and b:
1536 </p>
1539 <pre><tt>diff --git a/a b/b
1540 rename from a
1541 rename to b
1542 diff --git a/b b/a
1543 rename from b
1544 rename to a</tt></pre>
1545 </div></div>
1546 </li>
1547 </ol></div>
1548 </div>
1551 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1554 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1555 of these commands to force generation of diffs with individual parents
1556 of a merge.</p></div>
1560 <pre><tt>diff --combined describe.c
1561 index fabadb8,cc95eb0..4866510
1562 --- a/describe.c
1563 +++ b/describe.c
1566 }
1568 - static void describe(char *arg)
1569 -static void describe(struct commit *cmit, int last_one)
1570 ++static void describe(char *arg, int last_one)
1571 {
1572 + unsigned char sha1[20];
1573 + struct commit *cmit;
1574 struct commit_list *list;
1575 static int initialized = 0;
1576 struct commit_name *n;
1579 + usage(describe_usage);
1580 + cmit = lookup_commit_reference(sha1);
1581 + if (!cmit)
1582 + usage(describe_usage);
1583 +
1584 if (!initialized) {
1585 initialized = 1;
1586 for_each_ref(get_name);</tt></pre>
1587 </div></div>
1589 <li>
1590 <p>
1591 It is preceded with a "git diff" header, that looks like
1593 </p>
1597 </div></div>
1602 </div></div>
1603 </li>
1604 <li>
1605 <p>
1606 It is followed by one or more extended header lines
1607 (this example shows a merge with two parents):
1608 </p>
1615 </div></div>
1616 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1618 information about detected contents movement (renames and
1619 copying detection) are designed to work with diff of two
1621 </li>
1622 <li>
1623 <p>
1624 It is followed by two-line from-file/to-file header
1625 </p>
1628 <pre><tt>--- a/file
1629 +++ b/file</tt></pre>
1630 </div></div>
1633 files.</p></div>
1634 </li>
1635 <li>
1636 <p>
1637 Chunk header format is modified to prevent people from
1639 was created for review of merge commit changes, and was not
1640 meant for apply. The change is similar to the change in the
1642 </p>
1645 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1646 </div></div>
1648 header for combined diff format.</p></div>
1649 </li>
1650 </ol></div>
1652 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
1654 compares two or more files file1, file2,… with one file X, and
1655 shows how X differs from each of fileN. One column for each of
1656 fileN is prepended to the output line to note how X’s line is
1657 different from it.</p></div>
1658 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1660 in the column N means that the line appears in the result,
1661 and fileN does not have that line (in other words, the line was
1662 added, from the point of view of that parent).</p></div>
1666 in either file1 nor file2). Also eight other lines are the same
1668 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1669 merge commit with the merge result (i.e. file1..fileN are the
1671 two unresolved merge parents with the working tree file
1674 </div>
1677 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1679 output. These options can be combined with other options, such as
1681 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1682 formats the pathnames compactly by combining common prefix and suffix of
1688 </div></div>
1689 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1691 like this:</p></div>
1696 </div></div>
1699 <li>
1700 <p>
1701 the number of added lines;
1702 </p>
1703 </li>
1704 <li>
1705 <p>
1706 a tab;
1707 </p>
1708 </li>
1709 <li>
1710 <p>
1711 the number of deleted lines;
1712 </p>
1713 </li>
1714 <li>
1715 <p>
1716 a tab;
1717 </p>
1718 </li>
1719 <li>
1720 <p>
1721 pathname (possibly with rename/copy information);
1722 </p>
1723 </li>
1724 <li>
1725 <p>
1726 a newline.
1727 </p>
1728 </li>
1729 </ol></div>
1730 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1735 </div></div>
1738 <li>
1739 <p>
1740 the number of added lines;
1741 </p>
1742 </li>
1743 <li>
1744 <p>
1745 a tab;
1746 </p>
1747 </li>
1748 <li>
1749 <p>
1750 the number of deleted lines;
1751 </p>
1752 </li>
1753 <li>
1754 <p>
1755 a tab;
1756 </p>
1757 </li>
1758 <li>
1759 <p>
1760 a NUL (only exists if renamed/copied);
1761 </p>
1762 </li>
1763 <li>
1764 <p>
1765 pathname in preimage;
1766 </p>
1767 </li>
1768 <li>
1769 <p>
1770 a NUL (only exists if renamed/copied);
1771 </p>
1772 </li>
1773 <li>
1774 <p>
1775 pathname in postimage (only exists if renamed/copied);
1776 </p>
1777 </li>
1778 <li>
1779 <p>
1780 a NUL.
1781 </p>
1782 </li>
1783 </ol></div>
1784 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1785 scripts that read the output to tell if the current record being read is
1786 a single-path record or a rename/copy record without reading ahead.
1789 </div>
1794 Various ways to check your working tree
1795 </dt>
1796 <dd>
1802 </div></div>
1804 <li>
1805 <p>
1806 Changes in the working tree not yet staged for the next commit.
1807 </p>
1808 </li>
1809 <li>
1810 <p>
1811 Changes between the index and your last commit; what you
1813 </p>
1814 </li>
1815 <li>
1816 <p>
1817 Changes in the working tree since your last commit; what you
1818 would be committing if you run "git commit -a"
1819 </p>
1820 </li>
1821 </ol></div>
1822 </dd>
1824 Comparing with arbitrary commits
1825 </dt>
1826 <dd>
1832 </div></div>
1834 <li>
1835 <p>
1836 Instead of using the tip of the current branch, compare with the
1837 tip of "test" branch.
1838 </p>
1839 </li>
1840 <li>
1841 <p>
1842 Instead of comparing with the tip of "test" branch, compare with
1843 the tip of the current branch, but limit the comparison to the
1844 file "test".
1845 </p>
1846 </li>
1847 <li>
1848 <p>
1849 Compare the version before the last commit and the last commit.
1850 </p>
1851 </li>
1852 </ol></div>
1853 </dd>
1855 Comparing branches
1856 </dt>
1857 <dd>
1863 </div></div>
1865 <li>
1866 <p>
1867 Changes between the tips of the topic and the master branches.
1868 </p>
1869 </li>
1870 <li>
1871 <p>
1872 Same as above.
1873 </p>
1874 </li>
1875 <li>
1876 <p>
1877 Changes that occurred on the master branch since when the topic
1878 branch was started off it.
1879 </p>
1880 </li>
1881 </ol></div>
1882 </dd>
1884 Limiting the diff output
1885 </dt>
1886 <dd>
1892 </div></div>
1894 <li>
1895 <p>
1896 Show only modification, rename and copy, but not addition
1897 nor deletion.
1898 </p>
1899 </li>
1900 <li>
1901 <p>
1902 Show only names and the nature of change, but not actual
1903 diff output.
1904 </p>
1905 </li>
1906 <li>
1907 <p>
1908 Limit diff output to named subtrees.
1909 </p>
1910 </li>
1911 </ol></div>
1912 </dd>
1914 Munging the diff output
1915 </dt>
1916 <dd>
1921 </div></div>
1923 <li>
1924 <p>
1925 Spend extra cycles to find renames, copies and complete
1926 rewrites (very expensive).
1927 </p>
1928 </li>
1929 <li>
1930 <p>
1931 Output diff in reverse.
1932 </p>
1933 </li>
1934 </ol></div>
1935 </dd>
1936 </dl></div>
1937 </div>
1946 </div>
1950 </div>
1954 </div>
1955 </div>
1956 </body>
1957 </html>