| blob | d60485262d55438475f2d230d8fd7bcafc60aedc |
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-tree(1) Manual Page
407 </h1>
410 <p>git-diff-tree -
411 Compares the content and mode of blobs found via two tree objects
412 </p>
413 </div>
414 </div>
418 <div class="verseblock-content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
422 </div></div>
423 </div>
426 <div class="paragraph"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>
427 <div class="paragraph"><p>If there is only one <tree-ish> given, the commit is compared with its parents
428 (see --stdin below).</p></div>
429 <div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
430 </div>
435 -p
436 </dt>
438 -u
439 </dt>
441 --patch
442 </dt>
443 <dd>
444 <p>
445 Generate patch (see section on generating patches).
447 </p>
448 </dd>
451 </dt>
454 </dt>
455 <dd>
456 <p>
458 the usual three.
460 </p>
461 </dd>
463 --raw
464 </dt>
465 <dd>
466 <p>
467 Generate the raw format.
468 This is the default.
469 </p>
470 </dd>
472 --patch-with-raw
473 </dt>
474 <dd>
475 <p>
477 </p>
478 </dd>
480 --patience
481 </dt>
482 <dd>
483 <p>
484 Generate a diff using the "patience diff" algorithm.
485 </p>
486 </dd>
489 </dt>
490 <dd>
491 <p>
492 Generate a diffstat. You can override the default
494 The width of the filename part can be controlled by
495 giving another width to it separated by a comma.
496 </p>
497 </dd>
499 --numstat
500 </dt>
501 <dd>
502 <p>
504 deleted lines in decimal notation and pathname without
505 abbreviation, to make it more machine friendly. For
508 </p>
509 </dd>
511 --shortstat
512 </dt>
513 <dd>
514 <p>
516 number of modified files, as well as number of added and deleted
517 lines.
518 </p>
519 </dd>
522 </dt>
523 <dd>
524 <p>
525 Output the distribution of relative amount of changes (number of lines added or
526 removed) for each sub-directory. Directories with changes below
527 a cut-off percent (3% by default) are not shown. The cut-off percent
530 </p>
531 <div class="paragraph"><p>Note that the <tt>--dirstat</tt> option computes the changes while ignoring
532 the amount of pure code movements within a file. In other words,
533 rearranging lines in a file is not counted as much as other changes.</p></div>
534 </dd>
537 </dt>
538 <dd>
539 <p>
541 </p>
542 </dd>
544 --summary
545 </dt>
546 <dd>
547 <p>
548 Output a condensed summary of extended header information
549 such as creations, renames and mode changes.
550 </p>
551 </dd>
553 --patch-with-stat
554 </dt>
555 <dd>
556 <p>
558 </p>
559 </dd>
561 -z
562 </dt>
563 <dd>
564 <p>
565 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
566 given, do not munge pathnames and use NULs as output field terminators.
567 </p>
568 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
570 respectively, and the pathname will be enclosed in double quotes if
571 any of those replacements occurred.</p></div>
572 </dd>
574 --name-only
575 </dt>
576 <dd>
577 <p>
578 Show only names of changed files.
579 </p>
580 </dd>
582 --name-status
583 </dt>
584 <dd>
585 <p>
586 Show only names and status of changed files. See the description
587 of the <tt>--diff-filter</tt> option on what the status letters mean.
588 </p>
589 </dd>
591 --submodule[=<format>]
592 </dt>
593 <dd>
594 <p>
595 Chose the output format for submodule differences. <format> can be one of
596 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
597 is used when this option is not given. <em>log</em> is the default value for this
598 option and lists the commits in that commit range like the <em>summary</em>
600 </p>
601 </dd>
603 --color[=<when>]
604 </dt>
605 <dd>
606 <p>
607 Show colored diff.
608 The value must be always (the default), never, or auto.
609 </p>
610 </dd>
612 --no-color
613 </dt>
614 <dd>
615 <p>
616 Turn off colored diff, even when the configuration file
617 gives the default to color output.
618 Same as <tt>--color=never</tt>.
619 </p>
620 </dd>
622 --word-diff[=<mode>]
623 </dt>
624 <dd>
625 <p>
626 Show a word diff, using the <mode> to delimit changed words.
627 By default, words are delimited by whitespace; see
628 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
629 must be one of:
630 </p>
633 color
634 </dt>
635 <dd>
636 <p>
637 Highlight changed words using only colors. Implies <tt>--color</tt>.
638 </p>
639 </dd>
641 plain
642 </dt>
643 <dd>
644 <p>
645 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
646 attempts to escape the delimiters if they appear in the input,
647 so the output may be ambiguous.
648 </p>
649 </dd>
651 porcelain
652 </dt>
653 <dd>
654 <p>
655 Use a special line-based format intended for script
656 consumption. Added/removed/unchanged runs are printed in the
657 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
658 character at the beginning of the line and extending to the
659 end of the line. Newlines in the input are represented by a
660 tilde <tt>~</tt> on a line of its own.
661 </p>
662 </dd>
664 none
665 </dt>
666 <dd>
667 <p>
668 Disable word diff again.
669 </p>
670 </dd>
671 </dl></div>
673 highlight the changed parts in all modes if enabled.</p></div>
674 </dd>
676 --word-diff-regex=<regex>
677 </dt>
678 <dd>
679 <p>
680 Use <regex> to decide what a word is, instead of considering
681 runs of non-whitespace to be a word. Also implies
682 <tt>--word-diff</tt> unless it was already enabled.
683 </p>
685 <regex> is considered a word. Anything between these matches is
686 considered whitespace and ignored(!) for the purposes of finding
687 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
688 expression to make sure that it matches all non-whitespace characters.
689 A match that contains a newline is silently truncated(!) at the
690 newline.</p></div>
691 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
692 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
693 overrides any diff driver or configuration setting. Diff drivers
694 override configuration settings.</p></div>
695 </dd>
697 --color-words[=<regex>]
698 </dt>
699 <dd>
700 <p>
701 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
702 specified) <tt>--word-diff-regex=<regex></tt>.
703 </p>
704 </dd>
706 --no-renames
707 </dt>
708 <dd>
709 <p>
710 Turn off rename detection, even when the configuration
711 file gives the default to do so.
712 </p>
713 </dd>
715 --check
716 </dt>
717 <dd>
718 <p>
719 Warn if changes introduce trailing whitespace
720 or an indent that uses a space before a tab. Exits with
721 non-zero status if problems are found. Not compatible with
722 --exit-code.
723 </p>
724 </dd>
726 --full-index
727 </dt>
728 <dd>
729 <p>
730 Instead of the first handful of characters, show the full
732 line when generating patch format output.
733 </p>
734 </dd>
736 --binary
737 </dt>
738 <dd>
739 <p>
740 In addition to <tt>--full-index</tt>, output a binary diff that
741 can be applied with <tt>git-apply</tt>.
742 </p>
743 </dd>
745 --abbrev[=<n>]
746 </dt>
747 <dd>
748 <p>
749 Instead of showing the full 40-byte hexadecimal object
750 name in diff-raw format output and diff-tree header
751 lines, show only a partial prefix. This is
752 independent of the <tt>--full-index</tt> option above, which controls
753 the diff-patch output format. Non default number of
754 digits can be specified with <tt>--abbrev=<n></tt>.
755 </p>
756 </dd>
758 -B[<n>][/<m>]
759 </dt>
761 --break-rewrites[=[<n>][/<m>]]
762 </dt>
763 <dd>
764 <p>
765 Break complete rewrite changes into pairs of delete and
766 create. This serves two purposes:
767 </p>
769 not as a series of deletion and insertion mixed together with a very
770 few lines that happen to match textually as the context, but as a
771 single deletion of everything old followed by a single insertion of
772 everything new, and the number <tt>m</tt> controls this aspect of the -B
773 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
774 original should remain in the result for git to consider it a total
775 rewrite (i.e. otherwise the resulting patch will be a series of
776 deletion and insertion mixed together with context lines).</p></div>
778 source of a rename (usually -M only considers a file that disappeared
779 as the source of a rename), and the number <tt>n</tt> controls this aspect of
780 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
781 addition and deletion compared to 20% or more of the file’s size are
782 eligible for being picked up as a possible source of a rename to
783 another file.</p></div>
784 </dd>
786 -M[<n>]
787 </dt>
789 --find-renames[=<n>]
790 </dt>
791 <dd>
792 <p>
793 Detect renames.
794 If <tt>n</tt> is specified, it is a is a threshold on the similarity
795 index (i.e. amount of addition/deletions compared to the
796 file’s size). For example, <tt>-M90%</tt> means git should consider a
797 delete/add pair to be a rename if more than 90% of the file
798 hasn’t changed.
799 </p>
800 </dd>
802 -C[<n>]
803 </dt>
805 --find-copies[=<n>]
806 </dt>
807 <dd>
808 <p>
809 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
810 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
811 </p>
812 </dd>
814 --find-copies-harder
815 </dt>
816 <dd>
817 <p>
818 For performance reasons, by default, <tt>-C</tt> option finds copies only
819 if the original file of the copy was modified in the same
820 changeset. This flag makes the command
821 inspect unmodified files as candidates for the source of
822 copy. This is a very expensive operation for large
823 projects, so use it with caution. Giving more than one
824 <tt>-C</tt> option has the same effect.
825 </p>
826 </dd>
828 -D
829 </dt>
831 --irreversible-delete
832 </dt>
833 <dd>
834 <p>
835 Omit the preimage for deletes, i.e. print only the header but not
836 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
837 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
838 solely for people who want to just concentrate on reviewing the
839 text after the change. In addition, the output obviously lack
840 enough information to apply such a patch in reverse, even manually,
841 hence the name of the option.
842 </p>
843 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
844 of a delete/create pair.</p></div>
845 </dd>
847 -l<num>
848 </dt>
849 <dd>
850 <p>
851 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
852 is the number of potential rename/copy targets. This
853 option prevents rename/copy detection from running if
854 the number of rename/copy targets exceeds the specified
855 number.
856 </p>
857 </dd>
859 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
860 </dt>
861 <dd>
862 <p>
863 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
864 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
865 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
866 are Unmerged (<tt>U</tt>), are
867 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
868 Any combination of the filter characters (including none) can be used.
869 When <tt>*</tt> (All-or-none) is added to the combination, all
870 paths are selected if there is any file that matches
871 other criteria in the comparison; if there is no file
872 that matches other criteria, nothing is selected.
873 </p>
874 </dd>
876 -S<string>
877 </dt>
878 <dd>
879 <p>
880 Look for differences that introduce or remove an instance of
881 <string>. Note that this is different than the string simply
882 appearing in diff output; see the <em>pickaxe</em> entry in
884 </p>
885 </dd>
887 -G<regex>
888 </dt>
889 <dd>
890 <p>
891 Look for differences whose added or removed line matches
892 the given <regex>.
893 </p>
894 </dd>
896 --pickaxe-all
897 </dt>
898 <dd>
899 <p>
900 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
901 changeset, not just the files that contain the change
902 in <string>.
903 </p>
904 </dd>
906 --pickaxe-regex
907 </dt>
908 <dd>
909 <p>
910 Make the <string> not a plain string but an extended POSIX
911 regex to match.
912 </p>
913 </dd>
915 -O<orderfile>
916 </dt>
917 <dd>
918 <p>
919 Output the patch in the order specified in the
920 <orderfile>, which has one shell glob pattern per line.
921 </p>
922 </dd>
924 -R
925 </dt>
926 <dd>
927 <p>
928 Swap two inputs; that is, show differences from index or
929 on-disk file to tree contents.
930 </p>
931 </dd>
933 --relative[=<path>]
934 </dt>
935 <dd>
936 <p>
937 When run from a subdirectory of the project, it can be
938 told to exclude changes outside the directory and show
939 pathnames relative to it with this option. When you are
940 not in a subdirectory (e.g. in a bare repository), you
941 can name which subdirectory to make the output relative
942 to by giving a <path> as an argument.
943 </p>
944 </dd>
946 -a
947 </dt>
949 --text
950 </dt>
951 <dd>
952 <p>
953 Treat all files as text.
954 </p>
955 </dd>
957 --ignore-space-at-eol
958 </dt>
959 <dd>
960 <p>
961 Ignore changes in whitespace at EOL.
962 </p>
963 </dd>
965 -b
966 </dt>
968 --ignore-space-change
969 </dt>
970 <dd>
971 <p>
972 Ignore changes in amount of whitespace. This ignores whitespace
973 at line end, and considers all other sequences of one or
974 more whitespace characters to be equivalent.
975 </p>
976 </dd>
978 -w
979 </dt>
981 --ignore-all-space
982 </dt>
983 <dd>
984 <p>
985 Ignore whitespace when comparing lines. This ignores
986 differences even if one line has whitespace where the other
987 line has none.
988 </p>
989 </dd>
991 --inter-hunk-context=<lines>
992 </dt>
993 <dd>
994 <p>
995 Show the context between diff hunks, up to the specified number
996 of lines, thereby fusing hunks that are close to each other.
997 </p>
998 </dd>
1000 --exit-code
1001 </dt>
1002 <dd>
1003 <p>
1004 Make the program exit with codes similar to diff(1).
1005 That is, it exits with 1 if there were differences and
1006 0 means no differences.
1007 </p>
1008 </dd>
1010 --quiet
1011 </dt>
1012 <dd>
1013 <p>
1014 Disable all output of the program. Implies <tt>--exit-code</tt>.
1015 </p>
1016 </dd>
1018 --ext-diff
1019 </dt>
1020 <dd>
1021 <p>
1022 Allow an external diff helper to be executed. If you set an
1025 </p>
1026 </dd>
1028 --no-ext-diff
1029 </dt>
1030 <dd>
1031 <p>
1032 Disallow external diff drivers.
1033 </p>
1034 </dd>
1036 --ignore-submodules[=<when>]
1037 </dt>
1038 <dd>
1039 <p>
1040 Ignore changes to submodules in the diff generation. <when> can be
1043 untracked or modified files or its HEAD differs from the commit recorded
1044 in the superproject and can be used to override any settings of the
1045 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1047 contain untracked content (but they are still scanned for modified
1049 only changes to the commits stored in the superproject are shown (this was
1051 </p>
1052 </dd>
1054 --src-prefix=<prefix>
1055 </dt>
1056 <dd>
1057 <p>
1059 </p>
1060 </dd>
1062 --dst-prefix=<prefix>
1063 </dt>
1064 <dd>
1065 <p>
1067 </p>
1068 </dd>
1070 --no-prefix
1071 </dt>
1072 <dd>
1073 <p>
1074 Do not show any source or destination prefix.
1075 </p>
1076 </dd>
1077 </dl></div>
1082 <tree-ish>
1083 </dt>
1084 <dd>
1085 <p>
1086 The id of a tree object.
1087 </p>
1088 </dd>
1090 <path>…
1091 </dt>
1092 <dd>
1093 <p>
1094 If provided, the results are limited to a subset of files
1095 matching one of these prefix strings.
1096 i.e., file matches <tt>/^<pattern1>|<pattern2>|…/</tt>
1097 Note that this parameter does not provide any wildcard or regexp
1098 features.
1099 </p>
1100 </dd>
1102 -r
1103 </dt>
1104 <dd>
1105 <p>
1106 recurse into sub-trees
1107 </p>
1108 </dd>
1110 -t
1111 </dt>
1112 <dd>
1113 <p>
1114 show tree entry itself as well as subtrees. Implies -r.
1115 </p>
1116 </dd>
1118 --root
1119 </dt>
1120 <dd>
1121 <p>
1122 When <em>--root</em> is specified the initial commit will be shown as a big
1123 creation event. This is equivalent to a diff against the NULL tree.
1124 </p>
1125 </dd>
1127 --stdin
1128 </dt>
1129 <dd>
1130 <p>
1131 When <em>--stdin</em> is specified, the command does not take
1132 <tree-ish> arguments from the command line. Instead, it
1133 reads lines containing either two <tree>, one <commit>, or a
1134 list of <commit> from its standard input. (Use a single space
1135 as separator.)
1136 </p>
1137 <div class="paragraph"><p>When two trees are given, it compares the first tree with the second.
1138 When a single commit is given, it compares the commit with its
1139 parents. The remaining commits, when given, are used as if they are
1140 parents of the first commit.</p></div>
1142 and terminated by a newline) is printed before the difference. When
1143 comparing commits, the ID of the first (or only) commit, followed by a
1144 newline, is printed.</p></div>
1146 commits (but not trees).</p></div>
1147 </dd>
1149 -m
1150 </dt>
1151 <dd>
1152 <p>
1153 By default, <em>git diff-tree --stdin</em> does not show
1154 differences for merge commits. With this flag, it shows
1155 differences to that commit from all of its parents. See
1156 also <em>-c</em>.
1157 </p>
1158 </dd>
1160 -s
1161 </dt>
1162 <dd>
1163 <p>
1164 By default, <em>git diff-tree --stdin</em> shows differences,
1165 either in machine-readable form (without <em>-p</em>) or in patch
1166 form (with <em>-p</em>). This output can be suppressed. It is
1167 only useful with <em>-v</em> flag.
1168 </p>
1169 </dd>
1171 -v
1172 </dt>
1173 <dd>
1174 <p>
1175 This flag causes <em>git diff-tree --stdin</em> to also show
1176 the commit message before the differences.
1177 </p>
1178 </dd>
1180 --pretty[=<format>]
1181 </dt>
1183 --format=<format>
1184 </dt>
1185 <dd>
1186 <p>
1187 Pretty-print the contents of the commit logs in a given format,
1188 where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
1189 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See
1191 format. When omitted, the format defaults to <em>medium</em>.
1192 </p>
1195 </dd>
1197 --abbrev-commit
1198 </dt>
1199 <dd>
1200 <p>
1201 Instead of showing the full 40-byte hexadecimal commit object
1202 name, show only a partial prefix. Non default number of
1204 diff output, if it is displayed).
1205 </p>
1207 people using 80-column terminals.</p></div>
1208 </dd>
1210 --oneline
1211 </dt>
1212 <dd>
1213 <p>
1215 used together.
1216 </p>
1217 </dd>
1219 --encoding[=<encoding>]
1220 </dt>
1221 <dd>
1222 <p>
1223 The commit objects record the encoding used for the log message
1224 in their encoding header; this option can be used to tell the
1225 command to re-code the commit log message in the encoding
1226 preferred by the user. For non plumbing commands this
1227 defaults to UTF-8.
1228 </p>
1229 </dd>
1231 --notes[=<ref>]
1232 </dt>
1233 <dd>
1234 <p>
1236 commit, when showing the commit log message. This is the default
1237 for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when
1238 there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given
1239 on the command line.
1240 </p>
1242 <em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding
1243 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
1244 <div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the
1245 default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it
1246 is not qualified.</p></div>
1251 </dd>
1253 --no-notes
1254 </dt>
1255 <dd>
1256 <p>
1257 Do not show notes. This negates the above <tt>--notes</tt> option, by
1258 resetting the list of notes refs from which notes are shown.
1259 Options are parsed in the order given on the command line, so e.g.
1262 </p>
1263 </dd>
1265 --show-notes[=<ref>]
1266 </dt>
1268 --[no-]standard-notes
1269 </dt>
1270 <dd>
1271 <p>
1272 These options are deprecated. Use the above --notes/--no-notes
1273 options instead.
1274 </p>
1275 </dd>
1277 --no-commit-id
1278 </dt>
1279 <dd>
1280 <p>
1281 <em>git diff-tree</em> outputs a line with the commit ID when
1282 applicable. This flag suppressed the commit ID output.
1283 </p>
1284 </dd>
1286 -c
1287 </dt>
1288 <dd>
1289 <p>
1290 This flag changes the way a merge commit is displayed
1291 (which means it is useful only when the command is given
1292 one <tree-ish>, or <em>--stdin</em>). It shows the differences
1293 from each of the parents to the merge result simultaneously
1294 instead of showing pairwise diff between a parent and the
1295 result one at a time (which is what the <em>-m</em> option does).
1296 Furthermore, it lists only files which were modified
1297 from all parents.
1298 </p>
1299 </dd>
1301 --cc
1302 </dt>
1303 <dd>
1304 <p>
1305 This flag changes the way a merge commit patch is displayed,
1306 in a similar way to the <em>-c</em> option. It implies the <em>-c</em>
1307 and <em>-p</em> options and further compresses the patch output
1308 by omitting uninteresting hunks whose the contents in the parents
1309 have only two variants and the merge result picks one of them
1310 without modification. When all hunks are uninteresting, the commit
1311 itself and the commit log message is not shown, just like in any other
1313 </p>
1314 </dd>
1316 --always
1317 </dt>
1318 <dd>
1319 <p>
1320 Show the commit itself and the commit log message even
1321 if the diff itself is empty.
1322 </p>
1323 </dd>
1324 </dl></div>
1325 </div>
1329 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
1330 inserted before the <em>Author:</em> line. This line begins with
1332 separated by spaces. Note that the listed commits may not
1333 necessarily be the list of the <strong>direct</strong> parent commits if you
1334 have limited your view of history: for example, if you are
1335 only interested in changes related to a certain directory or
1336 file.</p></div>
1338 additional formats by setting a pretty.<name>
1339 config option to either another format name, or a
1340 <em>format:</em> string, as described below (see
1342 built-in formats:</p></div>
1344 <li>
1345 <p>
1346 <em>oneline</em>
1347 </p>
1350 <pre><tt><sha1> <title line></tt></pre>
1351 </div></div>
1353 </li>
1354 <li>
1355 <p>
1356 <em>short</em>
1357 </p>
1360 <pre><tt>commit <sha1>
1361 Author: <author></tt></pre>
1362 </div></div>
1365 <pre><tt><title line></tt></pre>
1366 </div></div>
1367 </li>
1368 <li>
1369 <p>
1370 <em>medium</em>
1371 </p>
1374 <pre><tt>commit <sha1>
1375 Author: <author>
1376 Date: <author date></tt></pre>
1377 </div></div>
1380 <pre><tt><title line></tt></pre>
1381 </div></div>
1384 <pre><tt><full commit message></tt></pre>
1385 </div></div>
1386 </li>
1387 <li>
1388 <p>
1389 <em>full</em>
1390 </p>
1393 <pre><tt>commit <sha1>
1394 Author: <author>
1395 Commit: <committer></tt></pre>
1396 </div></div>
1399 <pre><tt><title line></tt></pre>
1400 </div></div>
1403 <pre><tt><full commit message></tt></pre>
1404 </div></div>
1405 </li>
1406 <li>
1407 <p>
1408 <em>fuller</em>
1409 </p>
1412 <pre><tt>commit <sha1>
1413 Author: <author>
1414 AuthorDate: <author date>
1415 Commit: <committer>
1416 CommitDate: <committer date></tt></pre>
1417 </div></div>
1420 <pre><tt><title line></tt></pre>
1421 </div></div>
1424 <pre><tt><full commit message></tt></pre>
1425 </div></div>
1426 </li>
1427 <li>
1428 <p>
1429 <em>email</em>
1430 </p>
1433 <pre><tt>From <sha1> <date>
1434 From: <author>
1435 Date: <author date>
1436 Subject: [PATCH] <title line></tt></pre>
1437 </div></div>
1440 <pre><tt><full commit message></tt></pre>
1441 </div></div>
1442 </li>
1443 <li>
1444 <p>
1445 <em>raw</em>
1446 </p>
1448 stored in the commit object. Notably, the SHA1s are
1449 displayed in full, regardless of whether --abbrev or
1450 --no-abbrev are used, and <em>parents</em> information show the
1451 true parent commits, without taking grafts nor history
1452 simplification into account.</p></div>
1453 </li>
1454 <li>
1455 <p>
1456 <em>format:<string></em>
1457 </p>
1458 <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information
1459 you want to show. It works a little bit like printf format,
1460 with the notable exception that you get a newline with <em>%n</em>
1461 instead of <em>\n</em>.</p></div>
1462 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1463 would show something like this:</p></div>
1466 <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
1467 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
1468 </div></div>
1471 <li>
1472 <p>
1473 <em>%H</em>: commit hash
1474 </p>
1475 </li>
1476 <li>
1477 <p>
1478 <em>%h</em>: abbreviated commit hash
1479 </p>
1480 </li>
1481 <li>
1482 <p>
1483 <em>%T</em>: tree hash
1484 </p>
1485 </li>
1486 <li>
1487 <p>
1488 <em>%t</em>: abbreviated tree hash
1489 </p>
1490 </li>
1491 <li>
1492 <p>
1493 <em>%P</em>: parent hashes
1494 </p>
1495 </li>
1496 <li>
1497 <p>
1498 <em>%p</em>: abbreviated parent hashes
1499 </p>
1500 </li>
1501 <li>
1502 <p>
1503 <em>%an</em>: author name
1504 </p>
1505 </li>
1506 <li>
1507 <p>
1508 <em>%aN</em>: author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1509 </p>
1510 </li>
1511 <li>
1512 <p>
1513 <em>%ae</em>: author email
1514 </p>
1515 </li>
1516 <li>
1517 <p>
1518 <em>%aE</em>: author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1519 </p>
1520 </li>
1521 <li>
1522 <p>
1523 <em>%ad</em>: author date (format respects --date= option)
1524 </p>
1525 </li>
1526 <li>
1527 <p>
1528 <em>%aD</em>: author date, RFC2822 style
1529 </p>
1530 </li>
1531 <li>
1532 <p>
1533 <em>%ar</em>: author date, relative
1534 </p>
1535 </li>
1536 <li>
1537 <p>
1538 <em>%at</em>: author date, UNIX timestamp
1539 </p>
1540 </li>
1541 <li>
1542 <p>
1543 <em>%ai</em>: author date, ISO 8601 format
1544 </p>
1545 </li>
1546 <li>
1547 <p>
1548 <em>%cn</em>: committer name
1549 </p>
1550 </li>
1551 <li>
1552 <p>
1553 <em>%cN</em>: committer name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1554 </p>
1555 </li>
1556 <li>
1557 <p>
1558 <em>%ce</em>: committer email
1559 </p>
1560 </li>
1561 <li>
1562 <p>
1563 <em>%cE</em>: committer email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
1564 </p>
1565 </li>
1566 <li>
1567 <p>
1568 <em>%cd</em>: committer date
1569 </p>
1570 </li>
1571 <li>
1572 <p>
1573 <em>%cD</em>: committer date, RFC2822 style
1574 </p>
1575 </li>
1576 <li>
1577 <p>
1578 <em>%cr</em>: committer date, relative
1579 </p>
1580 </li>
1581 <li>
1582 <p>
1583 <em>%ct</em>: committer date, UNIX timestamp
1584 </p>
1585 </li>
1586 <li>
1587 <p>
1588 <em>%ci</em>: committer date, ISO 8601 format
1589 </p>
1590 </li>
1591 <li>
1592 <p>
1594 </p>
1595 </li>
1596 <li>
1597 <p>
1598 <em>%e</em>: encoding
1599 </p>
1600 </li>
1601 <li>
1602 <p>
1603 <em>%s</em>: subject
1604 </p>
1605 </li>
1606 <li>
1607 <p>
1608 <em>%f</em>: sanitized subject line, suitable for a filename
1609 </p>
1610 </li>
1611 <li>
1612 <p>
1613 <em>%b</em>: body
1614 </p>
1615 </li>
1616 <li>
1617 <p>
1618 <em>%B</em>: raw body (unwrapped subject and body)
1619 </p>
1620 </li>
1621 <li>
1622 <p>
1623 <em>%N</em>: commit notes
1624 </p>
1625 </li>
1626 <li>
1627 <p>
1628 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
1629 </p>
1630 </li>
1631 <li>
1632 <p>
1633 <em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt>
1634 </p>
1635 </li>
1636 <li>
1637 <p>
1638 <em>%gs</em>: reflog subject
1639 </p>
1640 </li>
1641 <li>
1642 <p>
1643 <em>%Cred</em>: switch color to red
1644 </p>
1645 </li>
1646 <li>
1647 <p>
1648 <em>%Cgreen</em>: switch color to green
1649 </p>
1650 </li>
1651 <li>
1652 <p>
1653 <em>%Cblue</em>: switch color to blue
1654 </p>
1655 </li>
1656 <li>
1657 <p>
1658 <em>%Creset</em>: reset color
1659 </p>
1660 </li>
1661 <li>
1662 <p>
1663 <em>%C(…)</em>: color specification, as described in color.branch.* config option
1664 </p>
1665 </li>
1666 <li>
1667 <p>
1668 <em>%m</em>: left, right or boundary mark
1669 </p>
1670 </li>
1671 <li>
1672 <p>
1673 <em>%n</em>: newline
1674 </p>
1675 </li>
1676 <li>
1677 <p>
1678 <em>%%</em>: a raw <em>%</em>
1679 </p>
1680 </li>
1681 <li>
1682 <p>
1683 <em>%x00</em>: print a byte from a hex code
1684 </p>
1685 </li>
1686 <li>
1687 <p>
1688 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
1690 </p>
1691 </li>
1692 </ul></div>
1693 </li>
1694 </ul></div>
1696 <table><tr>
1699 </td>
1701 revision traversal engine. For example, the <tt>%g*</tt> reflog options will
1702 insert an empty string unless we are traversing reflog entries (e.g., by
1704 format if <tt>--decorate</tt> was not already provided on the command line.</td>
1705 </tr></table>
1706 </div>
1707 <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
1708 is inserted immediately before the expansion if and only if the
1709 placeholder expands to a non-empty string.</p></div>
1710 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
1711 immediately precede the expansion are deleted if and only if the
1712 placeholder expands to an empty string.</p></div>
1714 is inserted immediately before the expansion if and only if the
1715 placeholder expands to a non-empty string.</p></div>
1717 <li>
1718 <p>
1719 <em>tformat:</em>
1720 </p>
1721 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1723 other words, each commit has the message terminator character (usually a
1724 newline) appended, rather than a separator placed between entries.
1725 This means that the final entry of a single-line format will be properly
1727 For example:</p></div>
1730 <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
1732 4da45be
1733 7134973 -- NO NEWLINE
1735 $ git log -2 --pretty=tformat:%h 4da45bef \
1737 4da45be
1738 7134973</tt></pre>
1739 </div></div>
1740 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
1741 as if it has <tt>tformat:</tt> in front of it. For example, these two are
1742 equivalent:</p></div>
1745 <pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef
1746 $ git log -2 --pretty=%h 4da45bef</tt></pre>
1747 </div></div>
1748 </li>
1749 </ul></div>
1750 </div>
1753 <div class="paragraph"><p>If you’re only interested in differences in a subset of files, for
1754 example some architecture-specific files, you might do:</p></div>
1757 <pre><tt>git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre>
1758 </div></div>
1759 <div class="paragraph"><p>and it will only show you what changed in those two directories.</p></div>
1760 <div class="paragraph"><p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p></div>
1763 <pre><tt>git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
1764 </div></div>
1766 <div class="paragraph"><p>The pattern is always the prefix, and is matched exactly. There are no
1767 wildcards. Even stricter, it has to match a complete path component.
1769 so it can be used to name subdirectories.</p></div>
1773 <pre><tt>torvalds@ppc970:~/git> git diff-tree 5319e4......
1774 *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c</tt></pre>
1775 </div></div>
1776 <div class="paragraph"><p>which tells you that the last commit changed just one file (it’s from
1777 this one:</p></div>
1780 <pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
1781 tree 5319e4d609cdd282069cc4dce33c1db559539b03
1782 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
1783 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
1784 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
1788 Once I do the reference tracking, I'll also make it print out all the
1789 HEAD commits it finds, which is even more interesting.</tt></pre>
1790 </div></div>
1792 </div>
1798 compared differs:</p></div>
1801 git-diff-index <tree-ish>
1802 </dt>
1803 <dd>
1804 <p>
1805 compares the <tree-ish> and the files on the filesystem.
1806 </p>
1807 </dd>
1809 git-diff-index --cached <tree-ish>
1810 </dt>
1811 <dd>
1812 <p>
1813 compares the <tree-ish> and the index.
1814 </p>
1815 </dd>
1817 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1818 </dt>
1819 <dd>
1820 <p>
1821 compares the trees named by the two arguments.
1822 </p>
1823 </dd>
1825 git-diff-files [<pattern>…]
1826 </dt>
1827 <dd>
1828 <p>
1829 compares the index and the files on the filesystem.
1830 </p>
1831 </dd>
1832 </dl></div>
1833 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1834 what is being compared. After that, all the commands print one output
1835 line per changed file.</p></div>
1839 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1840 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1841 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1842 create :000000 100644 0000000... 1234567... A file4
1843 delete :100644 000000 1234567... 0000000... D file5
1844 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1845 </div></div>
1848 <li>
1849 <p>
1850 a colon.
1851 </p>
1852 </li>
1853 <li>
1854 <p>
1856 </p>
1857 </li>
1858 <li>
1859 <p>
1860 a space.
1861 </p>
1862 </li>
1863 <li>
1864 <p>
1866 </p>
1867 </li>
1868 <li>
1869 <p>
1870 a space.
1871 </p>
1872 </li>
1873 <li>
1874 <p>
1876 </p>
1877 </li>
1878 <li>
1879 <p>
1880 a space.
1881 </p>
1882 </li>
1883 <li>
1884 <p>
1886 </p>
1887 </li>
1888 <li>
1889 <p>
1890 a space.
1891 </p>
1892 </li>
1893 <li>
1894 <p>
1896 </p>
1897 </li>
1898 <li>
1899 <p>
1900 a tab or a NUL when <em>-z</em> option is used.
1901 </p>
1902 </li>
1903 <li>
1904 <p>
1906 </p>
1907 </li>
1908 <li>
1909 <p>
1910 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1911 </p>
1912 </li>
1913 <li>
1914 <p>
1916 </p>
1917 </li>
1918 <li>
1919 <p>
1920 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1921 </p>
1922 </li>
1923 </ol></div>
1926 <li>
1927 <p>
1928 A: addition of a file
1929 </p>
1930 </li>
1931 <li>
1932 <p>
1933 C: copy of a file into a new one
1934 </p>
1935 </li>
1936 <li>
1937 <p>
1938 D: deletion of a file
1939 </p>
1940 </li>
1941 <li>
1942 <p>
1943 M: modification of the contents or mode of a file
1944 </p>
1945 </li>
1946 <li>
1947 <p>
1948 R: renaming of a file
1949 </p>
1950 </li>
1951 <li>
1952 <p>
1953 T: change in the type of the file
1954 </p>
1955 </li>
1956 <li>
1957 <p>
1958 U: file is unmerged (you must complete the merge before it can
1959 be committed)
1960 </p>
1961 </li>
1962 <li>
1963 <p>
1965 </p>
1966 </li>
1967 </ul></div>
1969 percentage of similarity between the source and target of the move or
1970 copy), and are the only ones to be so.</p></div>
1971 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1972 and it is out of sync with the index.</p></div>
1976 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1977 </div></div>
1978 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1979 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1980 respectively.</p></div>
1981 </div>
1985 can take <em>-c</em> or <em>--cc</em> option
1986 to generate diff output also for merge commits. The output differs
1987 from the format described above in the following way:</p></div>
1989 <li>
1990 <p>
1991 there is a colon for each parent
1992 </p>
1993 </li>
1994 <li>
1995 <p>
1997 </p>
1998 </li>
1999 <li>
2000 <p>
2001 status is concatenated status characters for each parent
2002 </p>
2003 </li>
2004 <li>
2005 <p>
2007 </p>
2008 </li>
2009 <li>
2010 <p>
2012 </p>
2013 </li>
2014 </ol></div>
2018 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
2019 </div></div>
2020 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
2021 all parents.</p></div>
2022 </div>
2028 do not produce the output described above; instead they produce a
2029 patch file. You can customize the creation of such patches via the
2030 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
2031 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2032 diff format:</p></div>
2034 <li>
2035 <p>
2037 </p>
2040 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2041 </div></div>
2042 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2043 involved. Especially, even for a creation or a deletion,
2044 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2045 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
2046 name of the source file of the rename/copy and the name of
2047 the file that rename/copy produces, respectively.</p></div>
2048 </li>
2049 <li>
2050 <p>
2051 It is followed by one or more extended header lines:
2052 </p>
2055 <pre><tt>old mode <mode>
2056 new mode <mode>
2057 deleted file mode <mode>
2058 new file mode <mode>
2059 copy from <path>
2060 copy to <path>
2061 rename from <path>
2062 rename to <path>
2063 similarity index <number>
2064 dissimilarity index <number>
2065 index <hash>..<hash> <mode></tt></pre>
2066 </div></div>
2067 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2068 and file permission bits.</p></div>
2069 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
2071 the dissimilarity index is the percentage of changed lines. It
2072 is a rounded down integer, followed by a percent sign. The
2073 similarity index value of 100% is thus reserved for two equal
2074 files, while 100% dissimilarity means that no line from the old
2075 file made it into the new one.</p></div>
2076 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
2077 The <mode> is included if the file mode does not change; otherwise,
2078 separate lines indicate the old and the new mode.</p></div>
2079 </li>
2080 <li>
2081 <p>
2082 TAB, LF, double quote and backslash characters in pathnames
2084 If there is need for such substitution then the whole
2085 pathname is put in double quotes.
2086 </p>
2087 </li>
2088 <li>
2089 <p>
2092 It is incorrect to apply each change to each file sequentially. For
2093 example, this patch will swap a and b:
2094 </p>
2097 <pre><tt>diff --git a/a b/b
2098 rename from a
2099 rename to b
2100 diff --git a/b b/a
2101 rename from b
2102 rename to a</tt></pre>
2103 </div></div>
2104 </li>
2105 </ol></div>
2106 </div>
2109 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
2112 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
2113 of these commands to force generation of diffs with individual parents
2114 of a merge.</p></div>
2118 <pre><tt>diff --combined describe.c
2119 index fabadb8,cc95eb0..4866510
2120 --- a/describe.c
2121 +++ b/describe.c
2124 }
2126 - static void describe(char *arg)
2127 -static void describe(struct commit *cmit, int last_one)
2128 ++static void describe(char *arg, int last_one)
2129 {
2130 + unsigned char sha1[20];
2131 + struct commit *cmit;
2132 struct commit_list *list;
2133 static int initialized = 0;
2134 struct commit_name *n;
2137 + usage(describe_usage);
2138 + cmit = lookup_commit_reference(sha1);
2139 + if (!cmit)
2140 + usage(describe_usage);
2141 +
2142 if (!initialized) {
2143 initialized = 1;
2144 for_each_ref(get_name);</tt></pre>
2145 </div></div>
2147 <li>
2148 <p>
2149 It is preceded with a "git diff" header, that looks like
2151 </p>
2155 </div></div>
2160 </div></div>
2161 </li>
2162 <li>
2163 <p>
2164 It is followed by one or more extended header lines
2165 (this example shows a merge with two parents):
2166 </p>
2173 </div></div>
2174 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
2176 information about detected contents movement (renames and
2177 copying detection) are designed to work with diff of two
2179 </li>
2180 <li>
2181 <p>
2182 It is followed by two-line from-file/to-file header
2183 </p>
2186 <pre><tt>--- a/file
2187 +++ b/file</tt></pre>
2188 </div></div>
2191 files.</p></div>
2192 </li>
2193 <li>
2194 <p>
2195 Chunk header format is modified to prevent people from
2197 was created for review of merge commit changes, and was not
2198 meant for apply. The change is similar to the change in the
2200 </p>
2203 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
2204 </div></div>
2206 header for combined diff format.</p></div>
2207 </li>
2208 </ol></div>
2210 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
2212 compares two or more files file1, file2,… with one file X, and
2213 shows how X differs from each of fileN. One column for each of
2214 fileN is prepended to the output line to note how X’s line is
2215 different from it.</p></div>
2216 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
2218 in the column N means that the line appears in the result,
2219 and fileN does not have that line (in other words, the line was
2220 added, from the point of view of that parent).</p></div>
2224 in either file1 nor file2). Also eight other lines are the same
2226 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
2227 merge commit with the merge result (i.e. file1..fileN are the
2229 two unresolved merge parents with the working tree file
2232 </div>
2235 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
2237 output. These options can be combined with other options, such as
2239 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
2240 formats the pathnames compactly by combining common prefix and suffix of
2246 </div></div>
2247 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
2249 like this:</p></div>
2254 </div></div>
2257 <li>
2258 <p>
2259 the number of added lines;
2260 </p>
2261 </li>
2262 <li>
2263 <p>
2264 a tab;
2265 </p>
2266 </li>
2267 <li>
2268 <p>
2269 the number of deleted lines;
2270 </p>
2271 </li>
2272 <li>
2273 <p>
2274 a tab;
2275 </p>
2276 </li>
2277 <li>
2278 <p>
2279 pathname (possibly with rename/copy information);
2280 </p>
2281 </li>
2282 <li>
2283 <p>
2284 a newline.
2285 </p>
2286 </li>
2287 </ol></div>
2288 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
2293 </div></div>
2296 <li>
2297 <p>
2298 the number of added lines;
2299 </p>
2300 </li>
2301 <li>
2302 <p>
2303 a tab;
2304 </p>
2305 </li>
2306 <li>
2307 <p>
2308 the number of deleted lines;
2309 </p>
2310 </li>
2311 <li>
2312 <p>
2313 a tab;
2314 </p>
2315 </li>
2316 <li>
2317 <p>
2318 a NUL (only exists if renamed/copied);
2319 </p>
2320 </li>
2321 <li>
2322 <p>
2323 pathname in preimage;
2324 </p>
2325 </li>
2326 <li>
2327 <p>
2328 a NUL (only exists if renamed/copied);
2329 </p>
2330 </li>
2331 <li>
2332 <p>
2333 pathname in postimage (only exists if renamed/copied);
2334 </p>
2335 </li>
2336 <li>
2337 <p>
2338 a NUL.
2339 </p>
2340 </li>
2341 </ol></div>
2342 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
2343 scripts that read the output to tell if the current record being read is
2344 a single-path record or a rename/copy record without reading ahead.
2347 </div>
2351 </div>
2355 </div>
2356 </div>
2357 </body>
2358 </html>