| blob | 382447a55a401b6f013d312f4c3135a2d95d9715 |
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 </dd>
534 </dt>
535 <dd>
536 <p>
538 </p>
539 </dd>
541 --summary
542 </dt>
543 <dd>
544 <p>
545 Output a condensed summary of extended header information
546 such as creations, renames and mode changes.
547 </p>
548 </dd>
550 --patch-with-stat
551 </dt>
552 <dd>
553 <p>
555 </p>
556 </dd>
558 -z
559 </dt>
560 <dd>
561 <p>
562 When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
563 given, do not munge pathnames and use NULs as output field terminators.
564 </p>
565 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
567 respectively, and the pathname will be enclosed in double quotes if
568 any of those replacements occurred.</p></div>
569 </dd>
571 --name-only
572 </dt>
573 <dd>
574 <p>
575 Show only names of changed files.
576 </p>
577 </dd>
579 --name-status
580 </dt>
581 <dd>
582 <p>
583 Show only names and status of changed files. See the description
584 of the <tt>--diff-filter</tt> option on what the status letters mean.
585 </p>
586 </dd>
588 --submodule[=<format>]
589 </dt>
590 <dd>
591 <p>
592 Chose the output format for submodule differences. <format> can be one of
593 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
594 is used when this option is not given. <em>log</em> is the default value for this
595 option and lists the commits in that commit range like the <em>summary</em>
597 </p>
598 </dd>
600 --color[=<when>]
601 </dt>
602 <dd>
603 <p>
604 Show colored diff.
605 The value must be always (the default), never, or auto.
606 </p>
607 </dd>
609 --no-color
610 </dt>
611 <dd>
612 <p>
613 Turn off colored diff, even when the configuration file
614 gives the default to color output.
615 Same as <tt>--color=never</tt>.
616 </p>
617 </dd>
619 --word-diff[=<mode>]
620 </dt>
621 <dd>
622 <p>
623 Show a word diff, using the <mode> to delimit changed words.
624 By default, words are delimited by whitespace; see
625 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
626 must be one of:
627 </p>
630 color
631 </dt>
632 <dd>
633 <p>
634 Highlight changed words using only colors. Implies <tt>--color</tt>.
635 </p>
636 </dd>
638 plain
639 </dt>
640 <dd>
641 <p>
642 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
643 attempts to escape the delimiters if they appear in the input,
644 so the output may be ambiguous.
645 </p>
646 </dd>
648 porcelain
649 </dt>
650 <dd>
651 <p>
652 Use a special line-based format intended for script
653 consumption. Added/removed/unchanged runs are printed in the
654 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
655 character at the beginning of the line and extending to the
656 end of the line. Newlines in the input are represented by a
657 tilde <tt>~</tt> on a line of its own.
658 </p>
659 </dd>
661 none
662 </dt>
663 <dd>
664 <p>
665 Disable word diff again.
666 </p>
667 </dd>
668 </dl></div>
670 highlight the changed parts in all modes if enabled.</p></div>
671 </dd>
673 --word-diff-regex=<regex>
674 </dt>
675 <dd>
676 <p>
677 Use <regex> to decide what a word is, instead of considering
678 runs of non-whitespace to be a word. Also implies
679 <tt>--word-diff</tt> unless it was already enabled.
680 </p>
682 <regex> is considered a word. Anything between these matches is
683 considered whitespace and ignored(!) for the purposes of finding
684 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
685 expression to make sure that it matches all non-whitespace characters.
686 A match that contains a newline is silently truncated(!) at the
687 newline.</p></div>
688 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
689 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
690 overrides any diff driver or configuration setting. Diff drivers
691 override configuration settings.</p></div>
692 </dd>
694 --color-words[=<regex>]
695 </dt>
696 <dd>
697 <p>
698 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
699 specified) <tt>--word-diff-regex=<regex></tt>.
700 </p>
701 </dd>
703 --no-renames
704 </dt>
705 <dd>
706 <p>
707 Turn off rename detection, even when the configuration
708 file gives the default to do so.
709 </p>
710 </dd>
712 --check
713 </dt>
714 <dd>
715 <p>
716 Warn if changes introduce trailing whitespace
717 or an indent that uses a space before a tab. Exits with
718 non-zero status if problems are found. Not compatible with
719 --exit-code.
720 </p>
721 </dd>
723 --full-index
724 </dt>
725 <dd>
726 <p>
727 Instead of the first handful of characters, show the full
729 line when generating patch format output.
730 </p>
731 </dd>
733 --binary
734 </dt>
735 <dd>
736 <p>
737 In addition to <tt>--full-index</tt>, output a binary diff that
738 can be applied with <tt>git-apply</tt>.
739 </p>
740 </dd>
742 --abbrev[=<n>]
743 </dt>
744 <dd>
745 <p>
746 Instead of showing the full 40-byte hexadecimal object
747 name in diff-raw format output and diff-tree header
748 lines, show only a partial prefix. This is
749 independent of the <tt>--full-index</tt> option above, which controls
750 the diff-patch output format. Non default number of
751 digits can be specified with <tt>--abbrev=<n></tt>.
752 </p>
753 </dd>
755 -B[<n>][/<m>]
756 </dt>
758 --break-rewrites[=[<n>][/<m>]]
759 </dt>
760 <dd>
761 <p>
762 Break complete rewrite changes into pairs of delete and
763 create. This serves two purposes:
764 </p>
766 not as a series of deletion and insertion mixed together with a very
767 few lines that happen to match textually as the context, but as a
768 single deletion of everything old followed by a single insertion of
769 everything new, and the number <tt>m</tt> controls this aspect of the -B
770 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
771 original should remain in the result for git to consider it a total
772 rewrite (i.e. otherwise the resulting patch will be a series of
773 deletion and insertion mixed together with context lines).</p></div>
775 source of a rename (usually -M only considers a file that disappeared
776 as the source of a rename), and the number <tt>n</tt> controls this aspect of
777 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
778 addition and deletion compared to 20% or more of the file’s size are
779 eligible for being picked up as a possible source of a rename to
780 another file.</p></div>
781 </dd>
783 -M[<n>]
784 </dt>
786 --find-renames[=<n>]
787 </dt>
788 <dd>
789 <p>
790 Detect renames.
791 If <tt>n</tt> is specified, it is a is a threshold on the similarity
792 index (i.e. amount of addition/deletions compared to the
793 file’s size). For example, <tt>-M90%</tt> means git should consider a
794 delete/add pair to be a rename if more than 90% of the file
795 hasn’t changed.
796 </p>
797 </dd>
799 -C[<n>]
800 </dt>
802 --find-copies[=<n>]
803 </dt>
804 <dd>
805 <p>
806 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
807 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
808 </p>
809 </dd>
811 --find-copies-harder
812 </dt>
813 <dd>
814 <p>
815 For performance reasons, by default, <tt>-C</tt> option finds copies only
816 if the original file of the copy was modified in the same
817 changeset. This flag makes the command
818 inspect unmodified files as candidates for the source of
819 copy. This is a very expensive operation for large
820 projects, so use it with caution. Giving more than one
821 <tt>-C</tt> option has the same effect.
822 </p>
823 </dd>
825 -l<num>
826 </dt>
827 <dd>
828 <p>
829 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
830 is the number of potential rename/copy targets. This
831 option prevents rename/copy detection from running if
832 the number of rename/copy targets exceeds the specified
833 number.
834 </p>
835 </dd>
837 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
838 </dt>
839 <dd>
840 <p>
841 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
842 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
843 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
844 are Unmerged (<tt>U</tt>), are
845 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
846 Any combination of the filter characters (including none) can be used.
847 When <tt>*</tt> (All-or-none) is added to the combination, all
848 paths are selected if there is any file that matches
849 other criteria in the comparison; if there is no file
850 that matches other criteria, nothing is selected.
851 </p>
852 </dd>
854 -S<string>
855 </dt>
856 <dd>
857 <p>
858 Look for differences that introduce or remove an instance of
859 <string>. Note that this is different than the string simply
860 appearing in diff output; see the <em>pickaxe</em> entry in
862 </p>
863 </dd>
865 -G<regex>
866 </dt>
867 <dd>
868 <p>
869 Look for differences whose added or removed line matches
870 the given <regex>.
871 </p>
872 </dd>
874 --pickaxe-all
875 </dt>
876 <dd>
877 <p>
878 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
879 changeset, not just the files that contain the change
880 in <string>.
881 </p>
882 </dd>
884 --pickaxe-regex
885 </dt>
886 <dd>
887 <p>
888 Make the <string> not a plain string but an extended POSIX
889 regex to match.
890 </p>
891 </dd>
893 -O<orderfile>
894 </dt>
895 <dd>
896 <p>
897 Output the patch in the order specified in the
898 <orderfile>, which has one shell glob pattern per line.
899 </p>
900 </dd>
902 -R
903 </dt>
904 <dd>
905 <p>
906 Swap two inputs; that is, show differences from index or
907 on-disk file to tree contents.
908 </p>
909 </dd>
911 --relative[=<path>]
912 </dt>
913 <dd>
914 <p>
915 When run from a subdirectory of the project, it can be
916 told to exclude changes outside the directory and show
917 pathnames relative to it with this option. When you are
918 not in a subdirectory (e.g. in a bare repository), you
919 can name which subdirectory to make the output relative
920 to by giving a <path> as an argument.
921 </p>
922 </dd>
924 -a
925 </dt>
927 --text
928 </dt>
929 <dd>
930 <p>
931 Treat all files as text.
932 </p>
933 </dd>
935 --ignore-space-at-eol
936 </dt>
937 <dd>
938 <p>
939 Ignore changes in whitespace at EOL.
940 </p>
941 </dd>
943 -b
944 </dt>
946 --ignore-space-change
947 </dt>
948 <dd>
949 <p>
950 Ignore changes in amount of whitespace. This ignores whitespace
951 at line end, and considers all other sequences of one or
952 more whitespace characters to be equivalent.
953 </p>
954 </dd>
956 -w
957 </dt>
959 --ignore-all-space
960 </dt>
961 <dd>
962 <p>
963 Ignore whitespace when comparing lines. This ignores
964 differences even if one line has whitespace where the other
965 line has none.
966 </p>
967 </dd>
969 --inter-hunk-context=<lines>
970 </dt>
971 <dd>
972 <p>
973 Show the context between diff hunks, up to the specified number
974 of lines, thereby fusing hunks that are close to each other.
975 </p>
976 </dd>
978 --exit-code
979 </dt>
980 <dd>
981 <p>
982 Make the program exit with codes similar to diff(1).
983 That is, it exits with 1 if there were differences and
984 0 means no differences.
985 </p>
986 </dd>
988 --quiet
989 </dt>
990 <dd>
991 <p>
992 Disable all output of the program. Implies <tt>--exit-code</tt>.
993 </p>
994 </dd>
996 --ext-diff
997 </dt>
998 <dd>
999 <p>
1000 Allow an external diff helper to be executed. If you set an
1003 </p>
1004 </dd>
1006 --no-ext-diff
1007 </dt>
1008 <dd>
1009 <p>
1010 Disallow external diff drivers.
1011 </p>
1012 </dd>
1014 --ignore-submodules[=<when>]
1015 </dt>
1016 <dd>
1017 <p>
1018 Ignore changes to submodules in the diff generation. <when> can be
1021 untracked or modified files or its HEAD differs from the commit recorded
1022 in the superproject and can be used to override any settings of the
1023 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1025 contain untracked content (but they are still scanned for modified
1027 only changes to the commits stored in the superproject are shown (this was
1029 </p>
1030 </dd>
1032 --src-prefix=<prefix>
1033 </dt>
1034 <dd>
1035 <p>
1037 </p>
1038 </dd>
1040 --dst-prefix=<prefix>
1041 </dt>
1042 <dd>
1043 <p>
1045 </p>
1046 </dd>
1048 --no-prefix
1049 </dt>
1050 <dd>
1051 <p>
1052 Do not show any source or destination prefix.
1053 </p>
1054 </dd>
1055 </dl></div>
1060 <tree-ish>
1061 </dt>
1062 <dd>
1063 <p>
1064 The id of a tree object.
1065 </p>
1066 </dd>
1068 <path>…
1069 </dt>
1070 <dd>
1071 <p>
1072 If provided, the results are limited to a subset of files
1073 matching one of these prefix strings.
1074 i.e., file matches <tt>/^<pattern1>|<pattern2>|…/</tt>
1075 Note that this parameter does not provide any wildcard or regexp
1076 features.
1077 </p>
1078 </dd>
1080 -r
1081 </dt>
1082 <dd>
1083 <p>
1084 recurse into sub-trees
1085 </p>
1086 </dd>
1088 -t
1089 </dt>
1090 <dd>
1091 <p>
1092 show tree entry itself as well as subtrees. Implies -r.
1093 </p>
1094 </dd>
1096 --root
1097 </dt>
1098 <dd>
1099 <p>
1100 When <em>--root</em> is specified the initial commit will be shown as a big
1101 creation event. This is equivalent to a diff against the NULL tree.
1102 </p>
1103 </dd>
1105 --stdin
1106 </dt>
1107 <dd>
1108 <p>
1109 When <em>--stdin</em> is specified, the command does not take
1110 <tree-ish> arguments from the command line. Instead, it
1111 reads lines containing either two <tree>, one <commit>, or a
1112 list of <commit> from its standard input. (Use a single space
1113 as separator.)
1114 </p>
1115 <div class="paragraph"><p>When two trees are given, it compares the first tree with the second.
1116 When a single commit is given, it compares the commit with its
1117 parents. The remaining commits, when given, are used as if they are
1118 parents of the first commit.</p></div>
1120 and terminated by a newline) is printed before the difference. When
1121 comparing commits, the ID of the first (or only) commit, followed by a
1122 newline, is printed.</p></div>
1124 commits (but not trees).</p></div>
1125 </dd>
1127 -m
1128 </dt>
1129 <dd>
1130 <p>
1131 By default, <em>git diff-tree --stdin</em> does not show
1132 differences for merge commits. With this flag, it shows
1133 differences to that commit from all of its parents. See
1134 also <em>-c</em>.
1135 </p>
1136 </dd>
1138 -s
1139 </dt>
1140 <dd>
1141 <p>
1142 By default, <em>git diff-tree --stdin</em> shows differences,
1143 either in machine-readable form (without <em>-p</em>) or in patch
1144 form (with <em>-p</em>). This output can be suppressed. It is
1145 only useful with <em>-v</em> flag.
1146 </p>
1147 </dd>
1149 -v
1150 </dt>
1151 <dd>
1152 <p>
1153 This flag causes <em>git diff-tree --stdin</em> to also show
1154 the commit message before the differences.
1155 </p>
1156 </dd>
1158 --pretty[=<format>]
1159 </dt>
1161 --format=<format>
1162 </dt>
1163 <dd>
1164 <p>
1165 Pretty-print the contents of the commit logs in a given format,
1166 where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
1167 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See
1169 format. When omitted, the format defaults to <em>medium</em>.
1170 </p>
1173 </dd>
1175 --abbrev-commit
1176 </dt>
1177 <dd>
1178 <p>
1179 Instead of showing the full 40-byte hexadecimal commit object
1180 name, show only a partial prefix. Non default number of
1182 diff output, if it is displayed).
1183 </p>
1185 people using 80-column terminals.</p></div>
1186 </dd>
1188 --oneline
1189 </dt>
1190 <dd>
1191 <p>
1193 used together.
1194 </p>
1195 </dd>
1197 --encoding[=<encoding>]
1198 </dt>
1199 <dd>
1200 <p>
1201 The commit objects record the encoding used for the log message
1202 in their encoding header; this option can be used to tell the
1203 command to re-code the commit log message in the encoding
1204 preferred by the user. For non plumbing commands this
1205 defaults to UTF-8.
1206 </p>
1207 </dd>
1209 --no-notes
1210 </dt>
1212 --show-notes[=<ref>]
1213 </dt>
1214 <dd>
1215 <p>
1217 commit, when showing the commit log message. This is the default
1218 for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when
1219 there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option is
1220 given on the command line.
1221 </p>
1222 <div class="paragraph"><p>With an optional argument, add this ref to the list of notes. The ref
1223 is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></div>
1224 </dd>
1226 --[no-]standard-notes
1227 </dt>
1228 <dd>
1229 <p>
1230 Enable or disable populating the notes ref list from the
1231 <em>core.notesRef</em> and <em>notes.displayRef</em> variables (or
1232 corresponding environment overrides). Enabled by default.
1234 </p>
1235 </dd>
1237 --no-commit-id
1238 </dt>
1239 <dd>
1240 <p>
1241 <em>git diff-tree</em> outputs a line with the commit ID when
1242 applicable. This flag suppressed the commit ID output.
1243 </p>
1244 </dd>
1246 -c
1247 </dt>
1248 <dd>
1249 <p>
1250 This flag changes the way a merge commit is displayed
1251 (which means it is useful only when the command is given
1252 one <tree-ish>, or <em>--stdin</em>). It shows the differences
1253 from each of the parents to the merge result simultaneously
1254 instead of showing pairwise diff between a parent and the
1255 result one at a time (which is what the <em>-m</em> option does).
1256 Furthermore, it lists only files which were modified
1257 from all parents.
1258 </p>
1259 </dd>
1261 --cc
1262 </dt>
1263 <dd>
1264 <p>
1265 This flag changes the way a merge commit patch is displayed,
1266 in a similar way to the <em>-c</em> option. It implies the <em>-c</em>
1267 and <em>-p</em> options and further compresses the patch output
1268 by omitting uninteresting hunks whose the contents in the parents
1269 have only two variants and the merge result picks one of them
1270 without modification. When all hunks are uninteresting, the commit
1271 itself and the commit log message is not shown, just like in any other
1273 </p>
1274 </dd>
1276 --always
1277 </dt>
1278 <dd>
1279 <p>
1280 Show the commit itself and the commit log message even
1281 if the diff itself is empty.
1282 </p>
1283 </dd>
1284 </dl></div>
1285 </div>
1289 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
1290 inserted before the <em>Author:</em> line. This line begins with
1292 separated by spaces. Note that the listed commits may not
1293 necessarily be the list of the <strong>direct</strong> parent commits if you
1294 have limited your view of history: for example, if you are
1295 only interested in changes related to a certain directory or
1296 file.</p></div>
1298 additional formats by setting a pretty.<name>
1299 config option to either another format name, or a
1300 <em>format:</em> string, as described below (see
1302 built-in formats:</p></div>
1304 <li>
1305 <p>
1306 <em>oneline</em>
1307 </p>
1310 <pre><tt><sha1> <title line></tt></pre>
1311 </div></div>
1313 </li>
1314 <li>
1315 <p>
1316 <em>short</em>
1317 </p>
1320 <pre><tt>commit <sha1>
1321 Author: <author></tt></pre>
1322 </div></div>
1325 <pre><tt><title line></tt></pre>
1326 </div></div>
1327 </li>
1328 <li>
1329 <p>
1330 <em>medium</em>
1331 </p>
1334 <pre><tt>commit <sha1>
1335 Author: <author>
1336 Date: <author date></tt></pre>
1337 </div></div>
1340 <pre><tt><title line></tt></pre>
1341 </div></div>
1344 <pre><tt><full commit message></tt></pre>
1345 </div></div>
1346 </li>
1347 <li>
1348 <p>
1349 <em>full</em>
1350 </p>
1353 <pre><tt>commit <sha1>
1354 Author: <author>
1355 Commit: <committer></tt></pre>
1356 </div></div>
1359 <pre><tt><title line></tt></pre>
1360 </div></div>
1363 <pre><tt><full commit message></tt></pre>
1364 </div></div>
1365 </li>
1366 <li>
1367 <p>
1368 <em>fuller</em>
1369 </p>
1372 <pre><tt>commit <sha1>
1373 Author: <author>
1374 AuthorDate: <author date>
1375 Commit: <committer>
1376 CommitDate: <committer 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>email</em>
1390 </p>
1393 <pre><tt>From <sha1> <date>
1394 From: <author>
1395 Date: <author date>
1396 Subject: [PATCH] <title line></tt></pre>
1397 </div></div>
1400 <pre><tt><full commit message></tt></pre>
1401 </div></div>
1402 </li>
1403 <li>
1404 <p>
1405 <em>raw</em>
1406 </p>
1408 stored in the commit object. Notably, the SHA1s are
1409 displayed in full, regardless of whether --abbrev or
1410 --no-abbrev are used, and <em>parents</em> information show the
1411 true parent commits, without taking grafts nor history
1412 simplification into account.</p></div>
1413 </li>
1414 <li>
1415 <p>
1416 <em>format:<string></em>
1417 </p>
1418 <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information
1419 you want to show. It works a little bit like printf format,
1420 with the notable exception that you get a newline with <em>%n</em>
1421 instead of <em>\n</em>.</p></div>
1422 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1423 would show something like this:</p></div>
1426 <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
1427 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
1428 </div></div>
1431 <li>
1432 <p>
1433 <em>%H</em>: commit hash
1434 </p>
1435 </li>
1436 <li>
1437 <p>
1438 <em>%h</em>: abbreviated commit hash
1439 </p>
1440 </li>
1441 <li>
1442 <p>
1443 <em>%T</em>: tree hash
1444 </p>
1445 </li>
1446 <li>
1447 <p>
1448 <em>%t</em>: abbreviated tree hash
1449 </p>
1450 </li>
1451 <li>
1452 <p>
1453 <em>%P</em>: parent hashes
1454 </p>
1455 </li>
1456 <li>
1457 <p>
1458 <em>%p</em>: abbreviated parent hashes
1459 </p>
1460 </li>
1461 <li>
1462 <p>
1463 <em>%an</em>: author name
1464 </p>
1465 </li>
1466 <li>
1467 <p>
1468 <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>)
1469 </p>
1470 </li>
1471 <li>
1472 <p>
1473 <em>%ae</em>: author email
1474 </p>
1475 </li>
1476 <li>
1477 <p>
1478 <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>)
1479 </p>
1480 </li>
1481 <li>
1482 <p>
1483 <em>%ad</em>: author date (format respects --date= option)
1484 </p>
1485 </li>
1486 <li>
1487 <p>
1488 <em>%aD</em>: author date, RFC2822 style
1489 </p>
1490 </li>
1491 <li>
1492 <p>
1493 <em>%ar</em>: author date, relative
1494 </p>
1495 </li>
1496 <li>
1497 <p>
1498 <em>%at</em>: author date, UNIX timestamp
1499 </p>
1500 </li>
1501 <li>
1502 <p>
1503 <em>%ai</em>: author date, ISO 8601 format
1504 </p>
1505 </li>
1506 <li>
1507 <p>
1508 <em>%cn</em>: committer name
1509 </p>
1510 </li>
1511 <li>
1512 <p>
1513 <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>)
1514 </p>
1515 </li>
1516 <li>
1517 <p>
1518 <em>%ce</em>: committer email
1519 </p>
1520 </li>
1521 <li>
1522 <p>
1523 <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>)
1524 </p>
1525 </li>
1526 <li>
1527 <p>
1528 <em>%cd</em>: committer date
1529 </p>
1530 </li>
1531 <li>
1532 <p>
1533 <em>%cD</em>: committer date, RFC2822 style
1534 </p>
1535 </li>
1536 <li>
1537 <p>
1538 <em>%cr</em>: committer date, relative
1539 </p>
1540 </li>
1541 <li>
1542 <p>
1543 <em>%ct</em>: committer date, UNIX timestamp
1544 </p>
1545 </li>
1546 <li>
1547 <p>
1548 <em>%ci</em>: committer date, ISO 8601 format
1549 </p>
1550 </li>
1551 <li>
1552 <p>
1554 </p>
1555 </li>
1556 <li>
1557 <p>
1558 <em>%e</em>: encoding
1559 </p>
1560 </li>
1561 <li>
1562 <p>
1563 <em>%s</em>: subject
1564 </p>
1565 </li>
1566 <li>
1567 <p>
1568 <em>%f</em>: sanitized subject line, suitable for a filename
1569 </p>
1570 </li>
1571 <li>
1572 <p>
1573 <em>%b</em>: body
1574 </p>
1575 </li>
1576 <li>
1577 <p>
1578 <em>%B</em>: raw body (unwrapped subject and body)
1579 </p>
1580 </li>
1581 <li>
1582 <p>
1583 <em>%N</em>: commit notes
1584 </p>
1585 </li>
1586 <li>
1587 <p>
1588 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
1589 </p>
1590 </li>
1591 <li>
1592 <p>
1593 <em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt>
1594 </p>
1595 </li>
1596 <li>
1597 <p>
1598 <em>%gs</em>: reflog subject
1599 </p>
1600 </li>
1601 <li>
1602 <p>
1603 <em>%Cred</em>: switch color to red
1604 </p>
1605 </li>
1606 <li>
1607 <p>
1608 <em>%Cgreen</em>: switch color to green
1609 </p>
1610 </li>
1611 <li>
1612 <p>
1613 <em>%Cblue</em>: switch color to blue
1614 </p>
1615 </li>
1616 <li>
1617 <p>
1618 <em>%Creset</em>: reset color
1619 </p>
1620 </li>
1621 <li>
1622 <p>
1623 <em>%C(…)</em>: color specification, as described in color.branch.* config option
1624 </p>
1625 </li>
1626 <li>
1627 <p>
1628 <em>%m</em>: left, right or boundary mark
1629 </p>
1630 </li>
1631 <li>
1632 <p>
1633 <em>%n</em>: newline
1634 </p>
1635 </li>
1636 <li>
1637 <p>
1638 <em>%%</em>: a raw <em>%</em>
1639 </p>
1640 </li>
1641 <li>
1642 <p>
1643 <em>%x00</em>: print a byte from a hex code
1644 </p>
1645 </li>
1646 <li>
1647 <p>
1648 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
1650 </p>
1651 </li>
1652 </ul></div>
1653 </li>
1654 </ul></div>
1656 <table><tr>
1659 </td>
1661 revision traversal engine. For example, the <tt>%g*</tt> reflog options will
1662 insert an empty string unless we are traversing reflog entries (e.g., by
1664 format if <tt>--decorate</tt> was not already provided on the command line.</td>
1665 </tr></table>
1666 </div>
1667 <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
1668 is inserted immediately before the expansion if and only if the
1669 placeholder expands to a non-empty string.</p></div>
1670 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
1671 immediately precede the expansion are deleted if and only if the
1672 placeholder expands to an empty string.</p></div>
1674 is inserted immediately before the expansion if and only if the
1675 placeholder expands to a non-empty string.</p></div>
1677 <li>
1678 <p>
1679 <em>tformat:</em>
1680 </p>
1681 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1683 other words, each commit has the message terminator character (usually a
1684 newline) appended, rather than a separator placed between entries.
1685 This means that the final entry of a single-line format will be properly
1687 For example:</p></div>
1690 <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
1692 4da45be
1693 7134973 -- NO NEWLINE
1695 $ git log -2 --pretty=tformat:%h 4da45bef \
1697 4da45be
1698 7134973</tt></pre>
1699 </div></div>
1700 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
1701 as if it has <tt>tformat:</tt> in front of it. For example, these two are
1702 equivalent:</p></div>
1705 <pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef
1706 $ git log -2 --pretty=%h 4da45bef</tt></pre>
1707 </div></div>
1708 </li>
1709 </ul></div>
1710 </div>
1713 <div class="paragraph"><p>If you’re only interested in differences in a subset of files, for
1714 example some architecture-specific files, you might do:</p></div>
1717 <pre><tt>git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre>
1718 </div></div>
1719 <div class="paragraph"><p>and it will only show you what changed in those two directories.</p></div>
1720 <div class="paragraph"><p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p></div>
1723 <pre><tt>git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
1724 </div></div>
1726 <div class="paragraph"><p>The pattern is always the prefix, and is matched exactly. There are no
1727 wildcards. Even stricter, it has to match a complete path component.
1729 so it can be used to name subdirectories.</p></div>
1733 <pre><tt>torvalds@ppc970:~/git> git diff-tree 5319e4......
1734 *100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c</tt></pre>
1735 </div></div>
1736 <div class="paragraph"><p>which tells you that the last commit changed just one file (it’s from
1737 this one:</p></div>
1740 <pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
1741 tree 5319e4d609cdd282069cc4dce33c1db559539b03
1742 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
1743 author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
1744 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
1748 Once I do the reference tracking, I'll also make it print out all the
1749 HEAD commits it finds, which is even more interesting.</tt></pre>
1750 </div></div>
1752 </div>
1758 compared differs:</p></div>
1761 git-diff-index <tree-ish>
1762 </dt>
1763 <dd>
1764 <p>
1765 compares the <tree-ish> and the files on the filesystem.
1766 </p>
1767 </dd>
1769 git-diff-index --cached <tree-ish>
1770 </dt>
1771 <dd>
1772 <p>
1773 compares the <tree-ish> and the index.
1774 </p>
1775 </dd>
1777 git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
1778 </dt>
1779 <dd>
1780 <p>
1781 compares the trees named by the two arguments.
1782 </p>
1783 </dd>
1785 git-diff-files [<pattern>…]
1786 </dt>
1787 <dd>
1788 <p>
1789 compares the index and the files on the filesystem.
1790 </p>
1791 </dd>
1792 </dl></div>
1793 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
1794 what is being compared. After that, all the commands print one output
1795 line per changed file.</p></div>
1799 <pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
1800 copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
1801 rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
1802 create :000000 100644 0000000... 1234567... A file4
1803 delete :100644 000000 1234567... 0000000... D file5
1804 unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
1805 </div></div>
1808 <li>
1809 <p>
1810 a colon.
1811 </p>
1812 </li>
1813 <li>
1814 <p>
1816 </p>
1817 </li>
1818 <li>
1819 <p>
1820 a space.
1821 </p>
1822 </li>
1823 <li>
1824 <p>
1826 </p>
1827 </li>
1828 <li>
1829 <p>
1830 a space.
1831 </p>
1832 </li>
1833 <li>
1834 <p>
1836 </p>
1837 </li>
1838 <li>
1839 <p>
1840 a space.
1841 </p>
1842 </li>
1843 <li>
1844 <p>
1846 </p>
1847 </li>
1848 <li>
1849 <p>
1850 a space.
1851 </p>
1852 </li>
1853 <li>
1854 <p>
1856 </p>
1857 </li>
1858 <li>
1859 <p>
1860 a tab or a NUL when <em>-z</em> option is used.
1861 </p>
1862 </li>
1863 <li>
1864 <p>
1866 </p>
1867 </li>
1868 <li>
1869 <p>
1870 a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
1871 </p>
1872 </li>
1873 <li>
1874 <p>
1876 </p>
1877 </li>
1878 <li>
1879 <p>
1880 an LF or a NUL when <em>-z</em> option is used, to terminate the record.
1881 </p>
1882 </li>
1883 </ol></div>
1886 <li>
1887 <p>
1888 A: addition of a file
1889 </p>
1890 </li>
1891 <li>
1892 <p>
1893 C: copy of a file into a new one
1894 </p>
1895 </li>
1896 <li>
1897 <p>
1898 D: deletion of a file
1899 </p>
1900 </li>
1901 <li>
1902 <p>
1903 M: modification of the contents or mode of a file
1904 </p>
1905 </li>
1906 <li>
1907 <p>
1908 R: renaming of a file
1909 </p>
1910 </li>
1911 <li>
1912 <p>
1913 T: change in the type of the file
1914 </p>
1915 </li>
1916 <li>
1917 <p>
1918 U: file is unmerged (you must complete the merge before it can
1919 be committed)
1920 </p>
1921 </li>
1922 <li>
1923 <p>
1925 </p>
1926 </li>
1927 </ul></div>
1929 percentage of similarity between the source and target of the move or
1930 copy), and are the only ones to be so.</p></div>
1931 <div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
1932 and it is out of sync with the index.</p></div>
1936 <pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
1937 </div></div>
1938 <div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
1939 in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
1940 respectively.</p></div>
1941 </div>
1945 can take <em>-c</em> or <em>--cc</em> option
1946 to generate diff output also for merge commits. The output differs
1947 from the format described above in the following way:</p></div>
1949 <li>
1950 <p>
1951 there is a colon for each parent
1952 </p>
1953 </li>
1954 <li>
1955 <p>
1957 </p>
1958 </li>
1959 <li>
1960 <p>
1961 status is concatenated status characters for each parent
1962 </p>
1963 </li>
1964 <li>
1965 <p>
1967 </p>
1968 </li>
1969 <li>
1970 <p>
1972 </p>
1973 </li>
1974 </ol></div>
1978 <pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
1979 </div></div>
1980 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
1981 all parents.</p></div>
1982 </div>
1988 do not produce the output described above; instead they produce a
1989 patch file. You can customize the creation of such patches via the
1990 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
1991 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
1992 diff format:</p></div>
1994 <li>
1995 <p>
1997 </p>
2000 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2001 </div></div>
2002 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2003 involved. Especially, even for a creation or a deletion,
2004 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2005 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
2006 name of the source file of the rename/copy and the name of
2007 the file that rename/copy produces, respectively.</p></div>
2008 </li>
2009 <li>
2010 <p>
2011 It is followed by one or more extended header lines:
2012 </p>
2015 <pre><tt>old mode <mode>
2016 new mode <mode>
2017 deleted file mode <mode>
2018 new file mode <mode>
2019 copy from <path>
2020 copy to <path>
2021 rename from <path>
2022 rename to <path>
2023 similarity index <number>
2024 dissimilarity index <number>
2025 index <hash>..<hash> <mode></tt></pre>
2026 </div></div>
2027 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2028 and file permission bits.</p></div>
2029 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
2031 the dissimilarity index is the percentage of changed lines. It
2032 is a rounded down integer, followed by a percent sign. The
2033 similarity index value of 100% is thus reserved for two equal
2034 files, while 100% dissimilarity means that no line from the old
2035 file made it into the new one.</p></div>
2036 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
2037 The <mode> is included if the file mode does not change; otherwise,
2038 separate lines indicate the old and the new mode.</p></div>
2039 </li>
2040 <li>
2041 <p>
2042 TAB, LF, double quote and backslash characters in pathnames
2044 If there is need for such substitution then the whole
2045 pathname is put in double quotes.
2046 </p>
2047 </li>
2048 <li>
2049 <p>
2052 It is incorrect to apply each change to each file sequentially. For
2053 example, this patch will swap a and b:
2054 </p>
2057 <pre><tt>diff --git a/a b/b
2058 rename from a
2059 rename to b
2060 diff --git a/b b/a
2061 rename from b
2062 rename to a</tt></pre>
2063 </div></div>
2064 </li>
2065 </ol></div>
2066 </div>
2069 <div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
2071 with "git log -p", this is the default format; you can force showing
2076 <pre><tt>diff --combined describe.c
2077 index fabadb8,cc95eb0..4866510
2078 --- a/describe.c
2079 +++ b/describe.c
2082 }
2084 - static void describe(char *arg)
2085 -static void describe(struct commit *cmit, int last_one)
2086 ++static void describe(char *arg, int last_one)
2087 {
2088 + unsigned char sha1[20];
2089 + struct commit *cmit;
2090 struct commit_list *list;
2091 static int initialized = 0;
2092 struct commit_name *n;
2095 + usage(describe_usage);
2096 + cmit = lookup_commit_reference(sha1);
2097 + if (!cmit)
2098 + usage(describe_usage);
2099 +
2100 if (!initialized) {
2101 initialized = 1;
2102 for_each_ref(get_name);</tt></pre>
2103 </div></div>
2105 <li>
2106 <p>
2107 It is preceded with a "git diff" header, that looks like
2109 </p>
2113 </div></div>
2118 </div></div>
2119 </li>
2120 <li>
2121 <p>
2122 It is followed by one or more extended header lines
2123 (this example shows a merge with two parents):
2124 </p>
2131 </div></div>
2132 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
2134 information about detected contents movement (renames and
2135 copying detection) are designed to work with diff of two
2137 </li>
2138 <li>
2139 <p>
2140 It is followed by two-line from-file/to-file header
2141 </p>
2144 <pre><tt>--- a/file
2145 +++ b/file</tt></pre>
2146 </div></div>
2149 files.</p></div>
2150 </li>
2151 <li>
2152 <p>
2153 Chunk header format is modified to prevent people from
2155 was created for review of merge commit changes, and was not
2156 meant for apply. The change is similar to the change in the
2158 </p>
2161 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
2162 </div></div>
2164 header for combined diff format.</p></div>
2165 </li>
2166 </ol></div>
2168 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
2170 compares two or more files file1, file2,… with one file X, and
2171 shows how X differs from each of fileN. One column for each of
2172 fileN is prepended to the output line to note how X’s line is
2173 different from it.</p></div>
2174 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
2176 in the column N means that the line appears in the result,
2177 and fileN does not have that line (in other words, the line was
2178 added, from the point of view of that parent).</p></div>
2182 in either file1 nor file2). Also eight other lines are the same
2184 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
2185 merge commit with the merge result (i.e. file1..fileN are the
2187 two unresolved merge parents with the working tree file
2190 </div>
2193 <div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
2195 output. These options can be combined with other options, such as
2197 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
2198 formats the pathnames compactly by combining common prefix and suffix of
2204 </div></div>
2205 <div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
2207 like this:</p></div>
2212 </div></div>
2215 <li>
2216 <p>
2217 the number of added lines;
2218 </p>
2219 </li>
2220 <li>
2221 <p>
2222 a tab;
2223 </p>
2224 </li>
2225 <li>
2226 <p>
2227 the number of deleted lines;
2228 </p>
2229 </li>
2230 <li>
2231 <p>
2232 a tab;
2233 </p>
2234 </li>
2235 <li>
2236 <p>
2237 pathname (possibly with rename/copy information);
2238 </p>
2239 </li>
2240 <li>
2241 <p>
2242 a newline.
2243 </p>
2244 </li>
2245 </ol></div>
2246 <div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
2251 </div></div>
2254 <li>
2255 <p>
2256 the number of added lines;
2257 </p>
2258 </li>
2259 <li>
2260 <p>
2261 a tab;
2262 </p>
2263 </li>
2264 <li>
2265 <p>
2266 the number of deleted lines;
2267 </p>
2268 </li>
2269 <li>
2270 <p>
2271 a tab;
2272 </p>
2273 </li>
2274 <li>
2275 <p>
2276 a NUL (only exists if renamed/copied);
2277 </p>
2278 </li>
2279 <li>
2280 <p>
2281 pathname in preimage;
2282 </p>
2283 </li>
2284 <li>
2285 <p>
2286 a NUL (only exists if renamed/copied);
2287 </p>
2288 </li>
2289 <li>
2290 <p>
2291 pathname in postimage (only exists if renamed/copied);
2292 </p>
2293 </li>
2294 <li>
2295 <p>
2296 a NUL.
2297 </p>
2298 </li>
2299 </ol></div>
2300 <div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
2301 scripts that read the output to tell if the current record being read is
2302 a single-path record or a rename/copy record without reading ahead.
2305 </div>
2308 <div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
2309 </div>
2312 <div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
2313 </div>
2317 </div>
2321 </div>
2322 </div>
2323 </body>
2324 </html>