| blob | 0d411a1a613979a4387658d7530f28a63a1f4b78 |
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.
584 </p>
585 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
586 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
587 </dd>
589 --numstat
590 </dt>
591 <dd>
592 <p>
594 deleted lines in decimal notation and pathname without
595 abbreviation, to make it more machine friendly. For
598 </p>
599 </dd>
601 --shortstat
602 </dt>
603 <dd>
604 <p>
606 number of modified files, as well as number of added and deleted
607 lines.
608 </p>
609 </dd>
612 </dt>
613 <dd>
614 <p>
615 Output the distribution of relative amount of changes for each
617 passing it a comma separated list of parameters.
620 The following parameters are available:
621 </p>
625 </dt>
626 <dd>
627 <p>
628 Compute the dirstat numbers by counting the lines that have been
629 removed from the source, or added to the destination. This ignores
630 the amount of pure code movements within a file. In other words,
631 rearranging lines in a file is not counted as much as other changes.
632 This is the default behavior when no parameter is given.
633 </p>
634 </dd>
637 </dt>
638 <dd>
639 <p>
640 Compute the dirstat numbers by doing the regular line-based diff
641 analysis, and summing the removed/added line counts. (For binary
642 files, count 64-byte chunks instead, since binary files have no
645 lines within a file as much as other changes. The resulting output
647 </p>
648 </dd>
651 </dt>
652 <dd>
653 <p>
654 Compute the dirstat numbers by counting the number of files changed.
655 Each changed file counts equally in the dirstat analysis. This is
657 not have to look at the file contents at all.
658 </p>
659 </dd>
662 </dt>
663 <dd>
664 <p>
665 Count changes in a child directory for the parent directory as well.
667 reported may exceed 100%. The default (non-cumulative) behavior can
669 </p>
670 </dd>
673 </dt>
674 <dd>
675 <p>
676 An integer parameter specifies a cut-off percent (3% by default).
677 Directories contributing less than this percentage of the changes
678 are not shown in the output.
679 </p>
680 </dd>
681 </dl></div>
683 directories with less than 10% of the total amount of changed files,
684 and accumulating child directory counts in the parent directories:
686 </dd>
688 --summary
689 </dt>
690 <dd>
691 <p>
692 Output a condensed summary of extended header information
693 such as creations, renames and mode changes.
694 </p>
695 </dd>
697 --patch-with-stat
698 </dt>
699 <dd>
700 <p>
702 </p>
703 </dd>
705 -z
706 </dt>
707 <dd>
708 <p>
709 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
710 given, do not munge pathnames and use NULs as output field terminators.
711 </p>
712 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
714 respectively, and the pathname will be enclosed in double quotes if
715 any of those replacements occurred.</p></div>
716 </dd>
718 --name-only
719 </dt>
720 <dd>
721 <p>
722 Show only names of changed files.
723 </p>
724 </dd>
726 --name-status
727 </dt>
728 <dd>
729 <p>
730 Show only names and status of changed files. See the description
731 of the <tt>--diff-filter</tt> option on what the status letters mean.
732 </p>
733 </dd>
735 --submodule[=<format>]
736 </dt>
737 <dd>
738 <p>
739 Chose the output format for submodule differences. <format> can be one of
740 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
741 is used when this option is not given. <em>log</em> is the default value for this
742 option and lists the commits in that commit range like the <em>summary</em>
744 </p>
745 </dd>
747 --color[=<when>]
748 </dt>
749 <dd>
750 <p>
751 Show colored diff.
752 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
753 The default value is <tt>never</tt>.
754 It can be changed by the <tt>color.ui</tt> and <tt>color.diff</tt>
755 configuration settings.
756 </p>
757 </dd>
759 --no-color
760 </dt>
761 <dd>
762 <p>
763 Turn off colored diff.
764 This can be used to override configuration settings.
765 It is the same as <tt>--color=never</tt>.
766 </p>
767 </dd>
769 --word-diff[=<mode>]
770 </dt>
771 <dd>
772 <p>
773 Show a word diff, using the <mode> to delimit changed words.
774 By default, words are delimited by whitespace; see
775 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
776 must be one of:
777 </p>
780 color
781 </dt>
782 <dd>
783 <p>
784 Highlight changed words using only colors. Implies <tt>--color</tt>.
785 </p>
786 </dd>
788 plain
789 </dt>
790 <dd>
791 <p>
792 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
793 attempts to escape the delimiters if they appear in the input,
794 so the output may be ambiguous.
795 </p>
796 </dd>
798 porcelain
799 </dt>
800 <dd>
801 <p>
802 Use a special line-based format intended for script
803 consumption. Added/removed/unchanged runs are printed in the
804 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
805 character at the beginning of the line and extending to the
806 end of the line. Newlines in the input are represented by a
807 tilde <tt>~</tt> on a line of its own.
808 </p>
809 </dd>
811 none
812 </dt>
813 <dd>
814 <p>
815 Disable word diff again.
816 </p>
817 </dd>
818 </dl></div>
820 highlight the changed parts in all modes if enabled.</p></div>
821 </dd>
823 --word-diff-regex=<regex>
824 </dt>
825 <dd>
826 <p>
827 Use <regex> to decide what a word is, instead of considering
828 runs of non-whitespace to be a word. Also implies
829 <tt>--word-diff</tt> unless it was already enabled.
830 </p>
832 <regex> is considered a word. Anything between these matches is
833 considered whitespace and ignored(!) for the purposes of finding
834 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
835 expression to make sure that it matches all non-whitespace characters.
836 A match that contains a newline is silently truncated(!) at the
837 newline.</p></div>
838 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
839 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
840 overrides any diff driver or configuration setting. Diff drivers
841 override configuration settings.</p></div>
842 </dd>
844 --color-words[=<regex>]
845 </dt>
846 <dd>
847 <p>
848 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
849 specified) <tt>--word-diff-regex=<regex></tt>.
850 </p>
851 </dd>
853 --no-renames
854 </dt>
855 <dd>
856 <p>
857 Turn off rename detection, even when the configuration
858 file gives the default to do so.
859 </p>
860 </dd>
862 --check
863 </dt>
864 <dd>
865 <p>
866 Warn if changes introduce whitespace errors. What are
867 considered whitespace errors is controlled by <tt>core.whitespace</tt>
868 configuration. By default, trailing whitespaces (including
869 lines that solely consist of whitespaces) and a space character
870 that is immediately followed by a tab character inside the
871 initial indent of the line are considered whitespace errors.
872 Exits with non-zero status if problems are found. Not compatible
873 with --exit-code.
874 </p>
875 </dd>
877 --full-index
878 </dt>
879 <dd>
880 <p>
881 Instead of the first handful of characters, show the full
883 line when generating patch format output.
884 </p>
885 </dd>
887 --binary
888 </dt>
889 <dd>
890 <p>
891 In addition to <tt>--full-index</tt>, output a binary diff that
892 can be applied with <tt>git-apply</tt>.
893 </p>
894 </dd>
896 --abbrev[=<n>]
897 </dt>
898 <dd>
899 <p>
900 Instead of showing the full 40-byte hexadecimal object
901 name in diff-raw format output and diff-tree header
902 lines, show only a partial prefix. This is
903 independent of the <tt>--full-index</tt> option above, which controls
904 the diff-patch output format. Non default number of
905 digits can be specified with <tt>--abbrev=<n></tt>.
906 </p>
907 </dd>
909 -B[<n>][/<m>]
910 </dt>
912 --break-rewrites[=[<n>][/<m>]]
913 </dt>
914 <dd>
915 <p>
916 Break complete rewrite changes into pairs of delete and
917 create. This serves two purposes:
918 </p>
920 not as a series of deletion and insertion mixed together with a very
921 few lines that happen to match textually as the context, but as a
922 single deletion of everything old followed by a single insertion of
923 everything new, and the number <tt>m</tt> controls this aspect of the -B
924 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
925 original should remain in the result for git to consider it a total
926 rewrite (i.e. otherwise the resulting patch will be a series of
927 deletion and insertion mixed together with context lines).</p></div>
929 source of a rename (usually -M only considers a file that disappeared
930 as the source of a rename), and the number <tt>n</tt> controls this aspect of
931 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
932 addition and deletion compared to 20% or more of the file’s size are
933 eligible for being picked up as a possible source of a rename to
934 another file.</p></div>
935 </dd>
937 -M[<n>]
938 </dt>
940 --find-renames[=<n>]
941 </dt>
942 <dd>
943 <p>
944 Detect renames.
945 If <tt>n</tt> is specified, it is a threshold on the similarity
946 index (i.e. amount of addition/deletions compared to the
947 file’s size). For example, <tt>-M90%</tt> means git should consider a
948 delete/add pair to be a rename if more than 90% of the file
949 hasn’t changed.
950 </p>
951 </dd>
953 -C[<n>]
954 </dt>
956 --find-copies[=<n>]
957 </dt>
958 <dd>
959 <p>
960 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
961 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
962 </p>
963 </dd>
965 --find-copies-harder
966 </dt>
967 <dd>
968 <p>
969 For performance reasons, by default, <tt>-C</tt> option finds copies only
970 if the original file of the copy was modified in the same
971 changeset. This flag makes the command
972 inspect unmodified files as candidates for the source of
973 copy. This is a very expensive operation for large
974 projects, so use it with caution. Giving more than one
975 <tt>-C</tt> option has the same effect.
976 </p>
977 </dd>
979 -D
980 </dt>
982 --irreversible-delete
983 </dt>
984 <dd>
985 <p>
986 Omit the preimage for deletes, i.e. print only the header but not
987 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
988 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
989 solely for people who want to just concentrate on reviewing the
990 text after the change. In addition, the output obviously lack
991 enough information to apply such a patch in reverse, even manually,
992 hence the name of the option.
993 </p>
994 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
995 of a delete/create pair.</p></div>
996 </dd>
998 -l<num>
999 </dt>
1000 <dd>
1001 <p>
1002 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
1003 is the number of potential rename/copy targets. This
1004 option prevents rename/copy detection from running if
1005 the number of rename/copy targets exceeds the specified
1006 number.
1007 </p>
1008 </dd>
1010 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
1011 </dt>
1012 <dd>
1013 <p>
1014 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
1015 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
1016 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
1017 are Unmerged (<tt>U</tt>), are
1018 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
1019 Any combination of the filter characters (including none) can be used.
1020 When <tt>*</tt> (All-or-none) is added to the combination, all
1021 paths are selected if there is any file that matches
1022 other criteria in the comparison; if there is no file
1023 that matches other criteria, nothing is selected.
1024 </p>
1025 </dd>
1027 -S<string>
1028 </dt>
1029 <dd>
1030 <p>
1031 Look for differences that introduce or remove an instance of
1032 <string>. Note that this is different than the string simply
1033 appearing in diff output; see the <em>pickaxe</em> entry in
1035 </p>
1036 </dd>
1038 -G<regex>
1039 </dt>
1040 <dd>
1041 <p>
1042 Look for differences whose added or removed line matches
1043 the given <regex>.
1044 </p>
1045 </dd>
1047 --pickaxe-all
1048 </dt>
1049 <dd>
1050 <p>
1051 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
1052 changeset, not just the files that contain the change
1053 in <string>.
1054 </p>
1055 </dd>
1057 --pickaxe-regex
1058 </dt>
1059 <dd>
1060 <p>
1061 Make the <string> not a plain string but an extended POSIX
1062 regex to match.
1063 </p>
1064 </dd>
1066 -O<orderfile>
1067 </dt>
1068 <dd>
1069 <p>
1070 Output the patch in the order specified in the
1071 <orderfile>, which has one shell glob pattern per line.
1072 </p>
1073 </dd>
1075 -R
1076 </dt>
1077 <dd>
1078 <p>
1079 Swap two inputs; that is, show differences from index or
1080 on-disk file to tree contents.
1081 </p>
1082 </dd>
1084 --relative[=<path>]
1085 </dt>
1086 <dd>
1087 <p>
1088 When run from a subdirectory of the project, it can be
1089 told to exclude changes outside the directory and show
1090 pathnames relative to it with this option. When you are
1091 not in a subdirectory (e.g. in a bare repository), you
1092 can name which subdirectory to make the output relative
1093 to by giving a <path> as an argument.
1094 </p>
1095 </dd>
1097 -a
1098 </dt>
1100 --text
1101 </dt>
1102 <dd>
1103 <p>
1104 Treat all files as text.
1105 </p>
1106 </dd>
1108 --ignore-space-at-eol
1109 </dt>
1110 <dd>
1111 <p>
1112 Ignore changes in whitespace at EOL.
1113 </p>
1114 </dd>
1116 -b
1117 </dt>
1119 --ignore-space-change
1120 </dt>
1121 <dd>
1122 <p>
1123 Ignore changes in amount of whitespace. This ignores whitespace
1124 at line end, and considers all other sequences of one or
1125 more whitespace characters to be equivalent.
1126 </p>
1127 </dd>
1129 -w
1130 </dt>
1132 --ignore-all-space
1133 </dt>
1134 <dd>
1135 <p>
1136 Ignore whitespace when comparing lines. This ignores
1137 differences even if one line has whitespace where the other
1138 line has none.
1139 </p>
1140 </dd>
1142 --inter-hunk-context=<lines>
1143 </dt>
1144 <dd>
1145 <p>
1146 Show the context between diff hunks, up to the specified number
1147 of lines, thereby fusing hunks that are close to each other.
1148 </p>
1149 </dd>
1151 --exit-code
1152 </dt>
1153 <dd>
1154 <p>
1155 Make the program exit with codes similar to diff(1).
1156 That is, it exits with 1 if there were differences and
1157 0 means no differences.
1158 </p>
1159 </dd>
1161 --quiet
1162 </dt>
1163 <dd>
1164 <p>
1165 Disable all output of the program. Implies <tt>--exit-code</tt>.
1166 </p>
1167 </dd>
1169 --ext-diff
1170 </dt>
1171 <dd>
1172 <p>
1173 Allow an external diff helper to be executed. If you set an
1176 </p>
1177 </dd>
1179 --no-ext-diff
1180 </dt>
1181 <dd>
1182 <p>
1183 Disallow external diff drivers.
1184 </p>
1185 </dd>
1187 --textconv
1188 </dt>
1190 --no-textconv
1191 </dt>
1192 <dd>
1193 <p>
1194 Allow (or disallow) external text conversion filters to be run
1196 details. Because textconv filters are typically a one-way
1197 conversion, the resulting diff is suitable for human
1198 consumption, but cannot be applied. For this reason, textconv
1200 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1201 diff plumbing commands.
1202 </p>
1203 </dd>
1205 --ignore-submodules[=<when>]
1206 </dt>
1207 <dd>
1208 <p>
1209 Ignore changes to submodules in the diff generation. <when> can be
1212 untracked or modified files or its HEAD differs from the commit recorded
1213 in the superproject and can be used to override any settings of the
1214 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1216 contain untracked content (but they are still scanned for modified
1218 only changes to the commits stored in the superproject are shown (this was
1220 </p>
1221 </dd>
1223 --src-prefix=<prefix>
1224 </dt>
1225 <dd>
1226 <p>
1228 </p>
1229 </dd>
1231 --dst-prefix=<prefix>
1232 </dt>
1233 <dd>
1234 <p>
1236 </p>
1237 </dd>
1239 --no-prefix
1240 </dt>
1241 <dd>
1242 <p>
1243 Do not show any source or destination prefix.
1244 </p>
1245 </dd>
1246 </dl></div>
1251 <path>…
1252 </dt>
1253 <dd>
1254 <p>
1255 The <paths> parameters, when given, are used to limit
1256 the diff to the named paths (you can give directory
1257 names and get diff for all files under them).
1258 </p>
1259 </dd>
1260 </dl></div>
1261 </div>
1267 compared differs:</p></div>
1270 git-diff-index <tree-ish>
1271 </dt>
1272 <dd>
1273 <p>
1274 compares the <tree-ish> and the files on the filesystem.
1275 </p>
1276 </dd>
1278 git-diff-index --cached <tree-ish>
1279 </dt>
1280 <dd>
1281 <p>
1282 compares the <tree-ish> and the index.
1283 </p>
1284 </dd>
1286 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1287 </dt>
1288 <dd>
1289 <p>
1290 compares the trees named by the two arguments.
1291 </p>
1292 </dd>
1294 git-diff-files [<pattern>…]
1295 </dt>
1296 <dd>
1297 <p>
1298 compares the index and the files on the filesystem.
1299 </p>
1300 </dd>
1301 </dl></div>
1302 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1303 what is being compared. After that, all the commands print one output
1304 line per changed file.</p></div>
1308 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1309 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1310 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1311 create :000000 100644 0000000... 1234567... A file4
1312 delete :100644 000000 1234567... 0000000... D file5
1313 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1314 </div></div>
1317 <li>
1318 <p>
1319 a colon.
1320 </p>
1321 </li>
1322 <li>
1323 <p>
1325 </p>
1326 </li>
1327 <li>
1328 <p>
1329 a space.
1330 </p>
1331 </li>
1332 <li>
1333 <p>
1335 </p>
1336 </li>
1337 <li>
1338 <p>
1339 a space.
1340 </p>
1341 </li>
1342 <li>
1343 <p>
1345 </p>
1346 </li>
1347 <li>
1348 <p>
1349 a space.
1350 </p>
1351 </li>
1352 <li>
1353 <p>
1355 </p>
1356 </li>
1357 <li>
1358 <p>
1359 a space.
1360 </p>
1361 </li>
1362 <li>
1363 <p>
1365 </p>
1366 </li>
1367 <li>
1368 <p>
1369 a tab or a NUL when <em>-z</em> option is used.
1370 </p>
1371 </li>
1372 <li>
1373 <p>
1375 </p>
1376 </li>
1377 <li>
1378 <p>
1379 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1380 </p>
1381 </li>
1382 <li>
1383 <p>
1385 </p>
1386 </li>
1387 <li>
1388 <p>
1389 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1390 </p>
1391 </li>
1392 </ol></div>
1395 <li>
1396 <p>
1397 A: addition of a file
1398 </p>
1399 </li>
1400 <li>
1401 <p>
1402 C: copy of a file into a new one
1403 </p>
1404 </li>
1405 <li>
1406 <p>
1407 D: deletion of a file
1408 </p>
1409 </li>
1410 <li>
1411 <p>
1412 M: modification of the contents or mode of a file
1413 </p>
1414 </li>
1415 <li>
1416 <p>
1417 R: renaming of a file
1418 </p>
1419 </li>
1420 <li>
1421 <p>
1422 T: change in the type of the file
1423 </p>
1424 </li>
1425 <li>
1426 <p>
1427 U: file is unmerged (you must complete the merge before it can
1428 be committed)
1429 </p>
1430 </li>
1431 <li>
1432 <p>
1434 </p>
1435 </li>
1436 </ul></div>
1438 percentage of similarity between the source and target of the move or
1439 copy), and are the only ones to be so.</p></div>
1440 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1441 and it is out of sync with the index.</p></div>
1445 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1446 </div></div>
1447 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1448 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1449 respectively.</p></div>
1450 </div>
1454 can take <em>-c</em> or <em>--cc</em> option
1455 to generate diff output also for merge commits. The output differs
1456 from the format described above in the following way:</p></div>
1458 <li>
1459 <p>
1460 there is a colon for each parent
1461 </p>
1462 </li>
1463 <li>
1464 <p>
1466 </p>
1467 </li>
1468 <li>
1469 <p>
1470 status is concatenated status characters for each parent
1471 </p>
1472 </li>
1473 <li>
1474 <p>
1476 </p>
1477 </li>
1478 <li>
1479 <p>
1481 </p>
1482 </li>
1483 </ol></div>
1487 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1488 </div></div>
1489 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1490 all parents.</p></div>
1491 </div>
1497 do not produce the output described above; instead they produce a
1498 patch file. You can customize the creation of such patches via the
1499 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1500 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1501 diff format:</p></div>
1503 <li>
1504 <p>
1506 </p>
1509 <pre><tt>diff --git a/file1 b/file2</tt></pre>
1510 </div></div>
1511 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
1512 involved. Especially, even for a creation or a deletion,
1513 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
1514 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
1515 name of the source file of the rename/copy and the name of
1516 the file that rename/copy produces, respectively.</p></div>
1517 </li>
1518 <li>
1519 <p>
1520 It is followed by one or more extended header lines:
1521 </p>
1524 <pre><tt>old mode <mode>
1525 new mode <mode>
1526 deleted file mode <mode>
1527 new file mode <mode>
1528 copy from <path>
1529 copy to <path>
1530 rename from <path>
1531 rename to <path>
1532 similarity index <number>
1533 dissimilarity index <number>
1534 index <hash>..<hash> <mode></tt></pre>
1535 </div></div>
1536 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
1537 and file permission bits.</p></div>
1538 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
1540 the dissimilarity index is the percentage of changed lines. It
1541 is a rounded down integer, followed by a percent sign. The
1542 similarity index value of 100% is thus reserved for two equal
1543 files, while 100% dissimilarity means that no line from the old
1544 file made it into the new one.</p></div>
1545 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
1546 The <mode> is included if the file mode does not change; otherwise,
1547 separate lines indicate the old and the new mode.</p></div>
1548 </li>
1549 <li>
1550 <p>
1551 TAB, LF, double quote and backslash characters in pathnames
1553 If there is need for such substitution then the whole
1554 pathname is put in double quotes.
1555 </p>
1556 </li>
1557 <li>
1558 <p>
1561 It is incorrect to apply each change to each file sequentially. For
1562 example, this patch will swap a and b:
1563 </p>
1566 <pre><tt>diff --git a/a b/b
1567 rename from a
1568 rename to b
1569 diff --git a/b b/a
1570 rename from b
1571 rename to a</tt></pre>
1572 </div></div>
1573 </li>
1574 </ol></div>
1575 </div>
1578 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
1581 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
1582 of these commands to force generation of diffs with individual parents
1583 of a merge.</p></div>
1587 <pre><tt>diff --combined describe.c
1588 index fabadb8,cc95eb0..4866510
1589 --- a/describe.c
1590 +++ b/describe.c
1593 }
1595 - static void describe(char *arg)
1596 -static void describe(struct commit *cmit, int last_one)
1597 ++static void describe(char *arg, int last_one)
1598 {
1599 + unsigned char sha1[20];
1600 + struct commit *cmit;
1601 struct commit_list *list;
1602 static int initialized = 0;
1603 struct commit_name *n;
1606 + usage(describe_usage);
1607 + cmit = lookup_commit_reference(sha1);
1608 + if (!cmit)
1609 + usage(describe_usage);
1610 +
1611 if (!initialized) {
1612 initialized = 1;
1613 for_each_ref(get_name);</tt></pre>
1614 </div></div>
1616 <li>
1617 <p>
1618 It is preceded with a "git diff" header, that looks like
1620 </p>
1624 </div></div>
1629 </div></div>
1630 </li>
1631 <li>
1632 <p>
1633 It is followed by one or more extended header lines
1634 (this example shows a merge with two parents):
1635 </p>
1642 </div></div>
1643 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
1645 information about detected contents movement (renames and
1646 copying detection) are designed to work with diff of two
1648 </li>
1649 <li>
1650 <p>
1651 It is followed by two-line from-file/to-file header
1652 </p>
1655 <pre><tt>--- a/file
1656 +++ b/file</tt></pre>
1657 </div></div>
1660 files.</p></div>
1661 </li>
1662 <li>
1663 <p>
1664 Chunk header format is modified to prevent people from
1666 was created for review of merge commit changes, and was not
1667 meant for apply. The change is similar to the change in the
1669 </p>
1672 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
1673 </div></div>
1675 header for combined diff format.</p></div>
1676 </li>
1677 </ol></div>
1679 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
1681 compares two or more files file1, file2,… with one file X, and
1682 shows how X differs from each of fileN. One column for each of
1683 fileN is prepended to the output line to note how X’s line is
1684 different from it.</p></div>
1685 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
1687 in the column N means that the line appears in the result,
1688 and fileN does not have that line (in other words, the line was
1689 added, from the point of view of that parent).</p></div>
1693 in either file1 nor file2). Also eight other lines are the same
1695 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
1696 merge commit with the merge result (i.e. file1..fileN are the
1698 two unresolved merge parents with the working tree file
1701 </div>
1704 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
1706 output. These options can be combined with other options, such as
1708 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
1709 formats the pathnames compactly by combining common prefix and suffix of
1715 </div></div>
1716 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
1718 like this:</p></div>
1723 </div></div>
1726 <li>
1727 <p>
1728 the number of added lines;
1729 </p>
1730 </li>
1731 <li>
1732 <p>
1733 a tab;
1734 </p>
1735 </li>
1736 <li>
1737 <p>
1738 the number of deleted lines;
1739 </p>
1740 </li>
1741 <li>
1742 <p>
1743 a tab;
1744 </p>
1745 </li>
1746 <li>
1747 <p>
1748 pathname (possibly with rename/copy information);
1749 </p>
1750 </li>
1751 <li>
1752 <p>
1753 a newline.
1754 </p>
1755 </li>
1756 </ol></div>
1757 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
1762 </div></div>
1765 <li>
1766 <p>
1767 the number of added lines;
1768 </p>
1769 </li>
1770 <li>
1771 <p>
1772 a tab;
1773 </p>
1774 </li>
1775 <li>
1776 <p>
1777 the number of deleted lines;
1778 </p>
1779 </li>
1780 <li>
1781 <p>
1782 a tab;
1783 </p>
1784 </li>
1785 <li>
1786 <p>
1787 a NUL (only exists if renamed/copied);
1788 </p>
1789 </li>
1790 <li>
1791 <p>
1792 pathname in preimage;
1793 </p>
1794 </li>
1795 <li>
1796 <p>
1797 a NUL (only exists if renamed/copied);
1798 </p>
1799 </li>
1800 <li>
1801 <p>
1802 pathname in postimage (only exists if renamed/copied);
1803 </p>
1804 </li>
1805 <li>
1806 <p>
1807 a NUL.
1808 </p>
1809 </li>
1810 </ol></div>
1811 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
1812 scripts that read the output to tell if the current record being read is
1813 a single-path record or a rename/copy record without reading ahead.
1816 </div>
1821 Various ways to check your working tree
1822 </dt>
1823 <dd>
1829 </div></div>
1831 <li>
1832 <p>
1833 Changes in the working tree not yet staged for the next commit.
1834 </p>
1835 </li>
1836 <li>
1837 <p>
1838 Changes between the index and your last commit; what you
1840 </p>
1841 </li>
1842 <li>
1843 <p>
1844 Changes in the working tree since your last commit; what you
1845 would be committing if you run "git commit -a"
1846 </p>
1847 </li>
1848 </ol></div>
1849 </dd>
1851 Comparing with arbitrary commits
1852 </dt>
1853 <dd>
1859 </div></div>
1861 <li>
1862 <p>
1863 Instead of using the tip of the current branch, compare with the
1864 tip of "test" branch.
1865 </p>
1866 </li>
1867 <li>
1868 <p>
1869 Instead of comparing with the tip of "test" branch, compare with
1870 the tip of the current branch, but limit the comparison to the
1871 file "test".
1872 </p>
1873 </li>
1874 <li>
1875 <p>
1876 Compare the version before the last commit and the last commit.
1877 </p>
1878 </li>
1879 </ol></div>
1880 </dd>
1882 Comparing branches
1883 </dt>
1884 <dd>
1890 </div></div>
1892 <li>
1893 <p>
1894 Changes between the tips of the topic and the master branches.
1895 </p>
1896 </li>
1897 <li>
1898 <p>
1899 Same as above.
1900 </p>
1901 </li>
1902 <li>
1903 <p>
1904 Changes that occurred on the master branch since when the topic
1905 branch was started off it.
1906 </p>
1907 </li>
1908 </ol></div>
1909 </dd>
1911 Limiting the diff output
1912 </dt>
1913 <dd>
1919 </div></div>
1921 <li>
1922 <p>
1923 Show only modification, rename and copy, but not addition
1924 nor deletion.
1925 </p>
1926 </li>
1927 <li>
1928 <p>
1929 Show only names and the nature of change, but not actual
1930 diff output.
1931 </p>
1932 </li>
1933 <li>
1934 <p>
1935 Limit diff output to named subtrees.
1936 </p>
1937 </li>
1938 </ol></div>
1939 </dd>
1941 Munging the diff output
1942 </dt>
1943 <dd>
1948 </div></div>
1950 <li>
1951 <p>
1952 Spend extra cycles to find renames, copies and complete
1953 rewrites (very expensive).
1954 </p>
1955 </li>
1956 <li>
1957 <p>
1958 Output diff in reverse.
1959 </p>
1960 </li>
1961 </ol></div>
1962 </dd>
1963 </dl></div>
1964 </div>
1973 </div>
1977 </div>
1981 </div>
1982 </div>
1983 </body>
1984 </html>