| blob | 61292ac7b502da6e2883a1aa9e227db6d2aa5319 |
4 <head>
8 /* Debug borders */
10 /*
11 border: 1px solid red;
12 */
13 }
15 body {
17 }
19 a {
22 }
25 }
27 em {
29 }
31 strong {
33 }
35 tt {
37 }
45 }
49 }
50 h2 {
52 }
53 h3 {
55 }
56 h3 + * {
58 }
63 }
65 hr {
67 }
69 p {
72 }
74 pre {
77 }
79 span#author {
84 }
85 span#email {
86 }
87 span#revision {
89 }
91 div#footer {
97 }
98 div#footer-text {
101 }
102 div#footer-badges {
105 }
107 div#preamble,
114 }
118 }
122 }
124 /* Block element titles. */
131 }
134 }
138 }
141 }
144 }
150 }
154 }
159 }
163 }
167 }
170 }
179 }
183 }
188 }
192 }
198 dl {
201 }
202 dt {
206 }
209 }
213 }
216 }
220 }
221 thead {
224 }
225 tfoot {
227 }
232 }
235 }
240 }
243 }
247 }
249 div#toctitle {
256 }
261 }
265 }
269 }
273 }
275 /* Workarounds for IE6's broken and incomplete CSS2. */
281 }
287 }
293 }
297 }
302 }
304 /* IE6 sets dynamically generated links as visited. */
306 </style>
308 </head>
309 <body>
311 <h1>
312 git-log(1) Manual Page
313 </h1>
316 <p>git-log -
317 Show commit logs
318 </p>
319 </div>
320 </div>
323 <div class="para"><p><em>git log</em> [<options>] [<since>..<until>] [[--] <path>…]</p></div>
324 </div>
329 command to control what is shown and how, and options applicable to
331 each commit introduces are shown.</p></div>
332 </div>
336 <dt>
337 -p
338 </dt>
339 <dt>
340 -u
341 </dt>
342 <dd>
343 <p>
344 Generate patch (see section on generating patches).
346 </p>
347 </dd>
348 <dt>
350 </dt>
351 <dt>
353 </dt>
354 <dd>
355 <p>
357 the usual three.
359 </p>
360 </dd>
361 <dt>
362 --raw
363 </dt>
364 <dd>
365 <p>
366 Generate the raw format.
368 </p>
369 </dd>
370 <dt>
371 --patch-with-raw
372 </dt>
373 <dd>
374 <p>
376 </p>
377 </dd>
378 <dt>
379 --patience
380 </dt>
381 <dd>
382 <p>
383 Generate a diff using the "patience diff" algorithm.
384 </p>
385 </dd>
386 <dt>
387 --stat[=width[,name-width]]
388 </dt>
389 <dd>
390 <p>
391 Generate a diffstat. You can override the default
393 The width of the filename part can be controlled by
394 giving another width to it separated by a comma.
395 </p>
396 </dd>
397 <dt>
398 --numstat
399 </dt>
400 <dd>
401 <p>
403 deleted lines in decimal notation and pathname without
404 abbreviation, to make it more machine friendly. For
407 </p>
408 </dd>
409 <dt>
410 --shortstat
411 </dt>
412 <dd>
413 <p>
415 number of modified files, as well as number of added and deleted
416 lines.
417 </p>
418 </dd>
419 <dt>
420 --dirstat[=limit]
421 </dt>
422 <dd>
423 <p>
424 Output the distribution of relative amount of changes (number of lines added or
425 removed) for each sub-directory. Directories with changes below
426 a cut-off percent (3% by default) are not shown. The cut-off percent
429 </p>
430 </dd>
431 <dt>
432 --dirstat-by-file[=limit]
433 </dt>
434 <dd>
435 <p>
437 </p>
438 </dd>
439 <dt>
440 --summary
441 </dt>
442 <dd>
443 <p>
444 Output a condensed summary of extended header information
445 such as creations, renames and mode changes.
446 </p>
447 </dd>
448 <dt>
449 --patch-with-stat
450 </dt>
451 <dd>
452 <p>
454 </p>
455 </dd>
456 <dt>
457 -z
458 </dt>
459 <dd>
460 <p>
461 Separate the commits with NULs instead of with new newlines.
462 </p>
463 <div class="para"><p>Also, when <tt>--raw</tt> or <tt>--numstat</tt> has been given, do not munge
464 pathnames and use NULs as output field terminators.</p></div>
465 <div class="para"><p>Without this option, each pathname output will have TAB, LF, double quotes,
467 respectively, and the pathname will be enclosed in double quotes if
468 any of those replacements occurred.</p></div>
469 </dd>
470 <dt>
471 --name-only
472 </dt>
473 <dd>
474 <p>
475 Show only names of changed files.
476 </p>
477 </dd>
478 <dt>
479 --name-status
480 </dt>
481 <dd>
482 <p>
483 Show only names and status of changed files. See the description
484 of the <tt>--diff-filter</tt> option on what the status letters mean.
485 </p>
486 </dd>
487 <dt>
488 --submodule[=<format>]
489 </dt>
490 <dd>
491 <p>
492 Chose the output format for submodule differences. <format> can be one of
493 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
494 is used when this option is not given. <em>log</em> is the default value for this
495 option and lists the commits in that commit range like the <em>summary</em>
497 </p>
498 </dd>
499 <dt>
500 --color
501 </dt>
502 <dd>
503 <p>
504 Show colored diff.
505 </p>
506 </dd>
507 <dt>
508 --no-color
509 </dt>
510 <dd>
511 <p>
512 Turn off colored diff, even when the configuration file
513 gives the default to color output.
514 </p>
515 </dd>
516 <dt>
517 --color-words[=<regex>]
518 </dt>
519 <dd>
520 <p>
521 Show colored word diff, i.e., color words which have changed.
522 By default, words are separated by whitespace.
523 </p>
525 <regex> is considered a word. Anything between these matches is
526 considered whitespace and ignored(!) for the purposes of finding
527 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
528 expression to make sure that it matches all non-whitespace characters.
529 A match that contains a newline is silently truncated(!) at the
530 newline.</p></div>
532 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
533 overrides any diff driver or configuration setting. Diff drivers
534 override configuration settings.</p></div>
535 </dd>
536 <dt>
537 --no-renames
538 </dt>
539 <dd>
540 <p>
541 Turn off rename detection, even when the configuration
542 file gives the default to do so.
543 </p>
544 </dd>
545 <dt>
546 --check
547 </dt>
548 <dd>
549 <p>
550 Warn if changes introduce trailing whitespace
551 or an indent that uses a space before a tab. Exits with
552 non-zero status if problems are found. Not compatible with
553 --exit-code.
554 </p>
555 </dd>
556 <dt>
557 --full-index
558 </dt>
559 <dd>
560 <p>
561 Instead of the first handful of characters, show the full
563 line when generating patch format output.
564 </p>
565 </dd>
566 <dt>
567 --binary
568 </dt>
569 <dd>
570 <p>
571 In addition to <tt>--full-index</tt>, output a binary diff that
572 can be applied with <tt>git-apply</tt>.
573 </p>
574 </dd>
575 <dt>
576 --abbrev[=<n>]
577 </dt>
578 <dd>
579 <p>
580 Instead of showing the full 40-byte hexadecimal object
581 name in diff-raw format output and diff-tree header
582 lines, show only a partial prefix. This is
583 independent of the <tt>--full-index</tt> option above, which controls
584 the diff-patch output format. Non default number of
585 digits can be specified with <tt>--abbrev=<n></tt>.
586 </p>
587 </dd>
588 <dt>
589 -B
590 </dt>
591 <dd>
592 <p>
593 Break complete rewrite changes into pairs of delete and create.
594 </p>
595 </dd>
596 <dt>
597 -M
598 </dt>
599 <dd>
600 <p>
601 Detect renames.
602 </p>
603 </dd>
604 <dt>
605 -C
606 </dt>
607 <dd>
608 <p>
609 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
610 </p>
611 </dd>
612 <dt>
613 --diff-filter=[ACDMRTUXB*]
614 </dt>
615 <dd>
616 <p>
617 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
618 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
619 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
620 are Unmerged (<tt>U</tt>), are
621 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
622 Any combination of the filter characters may be used.
623 When <tt>*</tt> (All-or-none) is added to the combination, all
624 paths are selected if there is any file that matches
625 other criteria in the comparison; if there is no file
626 that matches other criteria, nothing is selected.
627 </p>
628 </dd>
629 <dt>
630 --find-copies-harder
631 </dt>
632 <dd>
633 <p>
634 For performance reasons, by default, <tt>-C</tt> option finds copies only
635 if the original file of the copy was modified in the same
636 changeset. This flag makes the command
637 inspect unmodified files as candidates for the source of
638 copy. This is a very expensive operation for large
639 projects, so use it with caution. Giving more than one
640 <tt>-C</tt> option has the same effect.
641 </p>
642 </dd>
643 <dt>
644 -l<num>
645 </dt>
646 <dd>
647 <p>
648 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
649 is the number of potential rename/copy targets. This
650 option prevents rename/copy detection from running if
651 the number of rename/copy targets exceeds the specified
652 number.
653 </p>
654 </dd>
655 <dt>
656 -S<string>
657 </dt>
658 <dd>
659 <p>
660 Look for differences that introduce or remove an instance of
661 <string>. Note that this is different than the string simply
662 appearing in diff output; see the <em>pickaxe</em> entry in
664 </p>
665 </dd>
666 <dt>
667 --pickaxe-all
668 </dt>
669 <dd>
670 <p>
671 When <tt>-S</tt> finds a change, show all the changes in that
672 changeset, not just the files that contain the change
673 in <string>.
674 </p>
675 </dd>
676 <dt>
677 --pickaxe-regex
678 </dt>
679 <dd>
680 <p>
681 Make the <string> not a plain string but an extended POSIX
682 regex to match.
683 </p>
684 </dd>
685 <dt>
686 -O<orderfile>
687 </dt>
688 <dd>
689 <p>
690 Output the patch in the order specified in the
691 <orderfile>, which has one shell glob pattern per line.
692 </p>
693 </dd>
694 <dt>
695 -R
696 </dt>
697 <dd>
698 <p>
699 Swap two inputs; that is, show differences from index or
700 on-disk file to tree contents.
701 </p>
702 </dd>
703 <dt>
704 --relative[=<path>]
705 </dt>
706 <dd>
707 <p>
708 When run from a subdirectory of the project, it can be
709 told to exclude changes outside the directory and show
710 pathnames relative to it with this option. When you are
711 not in a subdirectory (e.g. in a bare repository), you
712 can name which subdirectory to make the output relative
713 to by giving a <path> as an argument.
714 </p>
715 </dd>
716 <dt>
717 -a
718 </dt>
719 <dt>
720 --text
721 </dt>
722 <dd>
723 <p>
724 Treat all files as text.
725 </p>
726 </dd>
727 <dt>
728 --ignore-space-at-eol
729 </dt>
730 <dd>
731 <p>
732 Ignore changes in whitespace at EOL.
733 </p>
734 </dd>
735 <dt>
736 -b
737 </dt>
738 <dt>
739 --ignore-space-change
740 </dt>
741 <dd>
742 <p>
743 Ignore changes in amount of whitespace. This ignores whitespace
744 at line end, and considers all other sequences of one or
745 more whitespace characters to be equivalent.
746 </p>
747 </dd>
748 <dt>
749 -w
750 </dt>
751 <dt>
752 --ignore-all-space
753 </dt>
754 <dd>
755 <p>
756 Ignore whitespace when comparing lines. This ignores
757 differences even if one line has whitespace where the other
758 line has none.
759 </p>
760 </dd>
761 <dt>
762 --inter-hunk-context=<lines>
763 </dt>
764 <dd>
765 <p>
766 Show the context between diff hunks, up to the specified number
767 of lines, thereby fusing hunks that are close to each other.
768 </p>
769 </dd>
770 <dt>
771 --exit-code
772 </dt>
773 <dd>
774 <p>
775 Make the program exit with codes similar to diff(1).
776 That is, it exits with 1 if there were differences and
777 0 means no differences.
778 </p>
779 </dd>
780 <dt>
781 --quiet
782 </dt>
783 <dd>
784 <p>
785 Disable all output of the program. Implies <tt>--exit-code</tt>.
786 </p>
787 </dd>
788 <dt>
789 --ext-diff
790 </dt>
791 <dd>
792 <p>
793 Allow an external diff helper to be executed. If you set an
796 </p>
797 </dd>
798 <dt>
799 --no-ext-diff
800 </dt>
801 <dd>
802 <p>
803 Disallow external diff drivers.
804 </p>
805 </dd>
806 <dt>
807 --ignore-submodules
808 </dt>
809 <dd>
810 <p>
811 Ignore changes to submodules in the diff generation.
812 </p>
813 </dd>
814 <dt>
815 --src-prefix=<prefix>
816 </dt>
817 <dd>
818 <p>
820 </p>
821 </dd>
822 <dt>
823 --dst-prefix=<prefix>
824 </dt>
825 <dd>
826 <p>
828 </p>
829 </dd>
830 <dt>
831 --no-prefix
832 </dt>
833 <dd>
834 <p>
835 Do not show any source or destination prefix.
836 </p>
837 </dd>
838 </dl></div>
842 <dt>
843 -<n>
844 </dt>
845 <dd>
846 <p>
847 Limits the number of commits to show.
848 </p>
849 </dd>
850 <dt>
851 <since>..<until>
852 </dt>
853 <dd>
854 <p>
855 Show only commits between the named two commits. When
856 either <since> or <until> is omitted, it defaults to
857 <tt>HEAD</tt>, i.e. the tip of the current branch.
858 For a more complete list of ways to spell <since>
861 </p>
862 </dd>
863 <dt>
864 --decorate[=short|full]
865 </dt>
866 <dd>
867 <p>
868 Print out the ref names of any commits that are shown. If <em>short</em> is
869 specified, the ref name prefixes <em>refs/heads/</em>, <em>refs/tags/</em> and
870 <em>refs/remotes/</em> will not be printed. If <em>full</em> is specified, the
871 full ref name (including prefix) will be printed. The default option
872 is <em>short</em>.
873 </p>
874 </dd>
875 <dt>
876 --source
877 </dt>
878 <dd>
879 <p>
880 Print out the ref name given on the command line by which each
881 commit was reached.
882 </p>
883 </dd>
884 <dt>
885 --full-diff
886 </dt>
887 <dd>
888 <p>
890 touch the specified paths, and diffs about the same specified
891 paths. With this, the full diff is shown for commits that touch
893 commits, and doesn't limit diff for those commits.
894 </p>
895 </dd>
896 <dt>
897 --follow
898 </dt>
899 <dd>
900 <p>
901 Continue listing the history of a file beyond renames.
902 </p>
903 </dd>
904 <dt>
905 --log-size
906 </dt>
907 <dd>
908 <p>
909 Before the log message print out its size in bytes. Intended
910 mainly for porcelain tools consumption. If git is unable to
911 produce a valid value size is set to zero.
912 Note that only message is considered, if also a diff is shown
913 its size is not included.
914 </p>
915 </dd>
916 <dt>
917 [--] <path>…
918 </dt>
919 <dd>
920 <p>
921 Show only commits that affect any of the specified paths. To
922 prevent confusion with options and branch names, paths may need
924 refnames.
925 </p>
926 </dd>
927 </dl></div>
930 <dt>
931 --pretty[=<em><format></em>]
932 </dt>
933 <dt>
934 --format[=<em><format></em>]
935 </dt>
936 <dd>
937 <p>
938 Pretty-print the contents of the commit logs in a given format,
939 where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
940 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>.
941 When omitted, the format defaults to <em>medium</em>.
942 </p>
945 </dd>
946 <dt>
947 --abbrev-commit
948 </dt>
949 <dd>
950 <p>
951 Instead of showing the full 40-byte hexadecimal commit object
952 name, show only a partial prefix. Non default number of
954 diff output, if it is displayed).
955 </p>
957 people using 80-column terminals.</p></div>
958 </dd>
959 <dt>
960 --oneline
961 </dt>
962 <dd>
963 <p>
965 used together.
966 </p>
967 </dd>
968 <dt>
969 --encoding[=<encoding>]
970 </dt>
971 <dd>
972 <p>
973 The commit objects record the encoding used for the log message
974 in their encoding header; this option can be used to tell the
975 command to re-code the commit log message in the encoding
976 preferred by the user. For non plumbing commands this
977 defaults to UTF-8.
978 </p>
979 </dd>
980 <dt>
981 --relative-date
982 </dt>
983 <dd>
984 <p>
985 Synonym for <tt>--date=relative</tt>.
986 </p>
987 </dd>
988 <dt>
989 --date={relative,local,default,iso,rfc,short,raw}
990 </dt>
991 <dd>
992 <p>
993 Only takes effect for dates shown in human-readable format, such
995 value for log command's --date option.
996 </p>
1000 <div class="para"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div>
1001 <div class="para"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822
1002 format, often found in E-mail messages.</p></div>
1003 <div class="para"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div>
1004 <div class="para"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div>
1006 (either committer's or author's).</p></div>
1007 </dd>
1008 <dt>
1009 --parents
1010 </dt>
1011 <dd>
1012 <p>
1013 Print the parents of the commit. Also enables parent
1014 rewriting, see <em>History Simplification</em> below.
1015 </p>
1016 </dd>
1017 <dt>
1018 --children
1019 </dt>
1020 <dd>
1021 <p>
1022 Print the children of the commit. Also enables parent
1023 rewriting, see <em>History Simplification</em> below.
1024 </p>
1025 </dd>
1026 <dt>
1027 --left-right
1028 </dt>
1029 <dd>
1030 <p>
1031 Mark which side of a symmetric diff a commit is reachable from.
1032 Commits from the left side are prefixed with <tt><</tt> and those from
1033 the right with <tt>></tt>. If combined with <tt>--boundary</tt>, those
1034 commits are prefixed with <tt>-</tt>.
1035 </p>
1039 <pre><tt> y---b---b branch B
1040 / \ /
1041 / .
1042 / / \
1043 o---x---a---a branch A</tt></pre>
1044 </div></div>
1048 <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B
1050 >bbbbbbb... 3rd on b
1051 >bbbbbbb... 2nd on b
1052 <aaaaaaa... 3rd on a
1053 <aaaaaaa... 2nd on a
1054 -yyyyyyy... 1st on b
1055 -xxxxxxx... 1st on a</tt></pre>
1056 </div></div>
1057 </dd>
1058 <dt>
1059 --graph
1060 </dt>
1061 <dd>
1062 <p>
1063 Draw a text-based graphical representation of the commit history
1064 on the left hand side of the output. This may cause extra lines
1065 to be printed in between commits, in order for the graph history
1066 to be drawn properly.
1067 </p>
1069 <em>--date-order</em> option may also be specified.</p></div>
1070 </dd>
1071 </dl></div>
1074 Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
1075 options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
1077 <dt>
1078 -c
1079 </dt>
1080 <dd>
1081 <p>
1082 This flag changes the way a merge commit is displayed. It shows
1083 the differences from each of the parents to the merge result
1084 simultaneously instead of showing pairwise diff between a parent
1085 and the result one at a time. Furthermore, it lists only files
1086 which were modified from all parents.
1087 </p>
1088 </dd>
1089 <dt>
1090 --cc
1091 </dt>
1092 <dd>
1093 <p>
1094 This flag implies the <em>-c</em> options and further compresses the
1095 patch output by omitting uninteresting hunks whose contents in
1096 the parents have only two variants and the merge result picks
1097 one of them without modification.
1098 </p>
1099 </dd>
1100 <dt>
1101 -r
1102 </dt>
1103 <dd>
1104 <p>
1105 Show recursive diffs.
1106 </p>
1107 </dd>
1108 <dt>
1109 -t
1110 </dt>
1111 <dd>
1112 <p>
1113 Show the tree objects in the diff output. This implies <em>-r</em>.
1114 </p>
1115 </dd>
1116 </dl></div>
1119 special notations explained in the description, additional commit
1120 limiting may be applied.</p></div>
1122 <dt>
1123 -n <em>number</em>
1124 </dt>
1125 <dt>
1126 --max-count=<number>
1127 </dt>
1128 <dd>
1129 <p>
1130 Limit the number of commits output.
1131 </p>
1132 </dd>
1133 <dt>
1134 --skip=<number>
1135 </dt>
1136 <dd>
1137 <p>
1138 Skip <em>number</em> commits before starting to show the commit output.
1139 </p>
1140 </dd>
1141 <dt>
1142 --since=<date>
1143 </dt>
1144 <dt>
1145 --after=<date>
1146 </dt>
1147 <dd>
1148 <p>
1149 Show commits more recent than a specific date.
1150 </p>
1151 </dd>
1152 <dt>
1153 --until=<date>
1154 </dt>
1155 <dt>
1156 --before=<date>
1157 </dt>
1158 <dd>
1159 <p>
1160 Show commits older than a specific date.
1161 </p>
1162 </dd>
1163 <dt>
1164 --author=<pattern>
1165 </dt>
1166 <dt>
1167 --committer=<pattern>
1168 </dt>
1169 <dd>
1170 <p>
1171 Limit the commits output to ones with author/committer
1172 header lines that match the specified pattern (regular expression).
1173 </p>
1174 </dd>
1175 <dt>
1176 --grep=<pattern>
1177 </dt>
1178 <dd>
1179 <p>
1180 Limit the commits output to ones with log message that
1181 matches the specified pattern (regular expression).
1182 </p>
1183 </dd>
1184 <dt>
1185 --all-match
1186 </dt>
1187 <dd>
1188 <p>
1189 Limit the commits output to ones that match all given --grep,
1190 --author and --committer instead of ones that match at least one.
1191 </p>
1192 </dd>
1193 <dt>
1194 -i
1195 </dt>
1196 <dt>
1197 --regexp-ignore-case
1198 </dt>
1199 <dd>
1200 <p>
1201 Match the regexp limiting patterns without regard to letters case.
1202 </p>
1203 </dd>
1204 <dt>
1205 -E
1206 </dt>
1207 <dt>
1208 --extended-regexp
1209 </dt>
1210 <dd>
1211 <p>
1212 Consider the limiting patterns to be extended regular expressions
1213 instead of the default basic regular expressions.
1214 </p>
1215 </dd>
1216 <dt>
1217 -F
1218 </dt>
1219 <dt>
1220 --fixed-strings
1221 </dt>
1222 <dd>
1223 <p>
1224 Consider the limiting patterns to be fixed strings (don't interpret
1225 pattern as a regular expression).
1226 </p>
1227 </dd>
1228 <dt>
1229 --remove-empty
1230 </dt>
1231 <dd>
1232 <p>
1233 Stop when a given path disappears from the tree.
1234 </p>
1235 </dd>
1236 <dt>
1237 --merges
1238 </dt>
1239 <dd>
1240 <p>
1241 Print only merge commits.
1242 </p>
1243 </dd>
1244 <dt>
1245 --no-merges
1246 </dt>
1247 <dd>
1248 <p>
1249 Do not print commits with more than one parent.
1250 </p>
1251 </dd>
1252 <dt>
1253 --first-parent
1254 </dt>
1255 <dd>
1256 <p>
1257 Follow only the first parent commit upon seeing a merge
1258 commit. This option can give a better overview when
1259 viewing the evolution of a particular topic branch,
1260 because merges into a topic branch tend to be only about
1261 adjusting to updated upstream from time to time, and
1262 this option allows you to ignore the individual commits
1263 brought in to your history by such a merge.
1264 </p>
1265 </dd>
1266 <dt>
1267 --not
1268 </dt>
1269 <dd>
1270 <p>
1271 Reverses the meaning of the <em>^</em> prefix (or lack thereof)
1272 for all following revision specifiers, up to the next <em>--not</em>.
1273 </p>
1274 </dd>
1275 <dt>
1276 --all
1277 </dt>
1278 <dd>
1279 <p>
1280 Pretend as if all the refs in <tt>$GIT_DIR/refs/</tt> are listed on the
1281 command line as <em><commit></em>.
1282 </p>
1283 </dd>
1284 <dt>
1285 --branches
1286 </dt>
1287 <dd>
1288 <p>
1289 Pretend as if all the refs in <tt>$GIT_DIR/refs/heads</tt> are listed
1290 on the command line as <em><commit></em>.
1291 </p>
1292 </dd>
1293 <dt>
1294 --tags
1295 </dt>
1296 <dd>
1297 <p>
1298 Pretend as if all the refs in <tt>$GIT_DIR/refs/tags</tt> are listed
1299 on the command line as <em><commit></em>.
1300 </p>
1301 </dd>
1302 <dt>
1303 --remotes
1304 </dt>
1305 <dd>
1306 <p>
1307 Pretend as if all the refs in <tt>$GIT_DIR/refs/remotes</tt> are listed
1308 on the command line as <em><commit></em>.
1309 </p>
1310 </dd>
1311 <dt>
1312 --bisect
1313 </dt>
1314 <dd>
1315 <p>
1316 Pretend as if the bad bisection ref <tt>$GIT_DIR/refs/bisect/bad</tt>
1317 was listed and as if it was followed by <tt>--not</tt> and the good
1318 bisection refs <tt>$GIT_DIR/refs/bisect/good-*</tt> on the command
1319 line.
1320 </p>
1321 </dd>
1322 <dt>
1323 --stdin
1324 </dt>
1325 <dd>
1326 <p>
1327 In addition to the <em><commit></em> listed on the command
1328 line, read them from the standard input. If a <em>--</em> separator is
1329 seen, stop reading commits and start reading paths to limit the
1330 result.
1331 </p>
1332 </dd>
1333 <dt>
1334 --cherry-pick
1335 </dt>
1336 <dd>
1337 <p>
1338 Omit any commit that introduces the same change as
1340 commits are limited with symmetric difference.<br />
1341 For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way
1342 to list all commits on only one side of them is with
1343 <tt>--left-right</tt>, like the example above in the description of
1344 that option. It however shows the commits that were cherry-picked
1346 from branch A). With this option, such pairs of commits are
1347 excluded from the output.
1348 </p>
1349 </dd>
1350 <dt>
1351 -g
1352 </dt>
1353 <dt>
1354 --walk-reflogs
1355 </dt>
1356 <dd>
1357 <p>
1358 Instead of walking the commit ancestry chain, walk
1359 reflog entries from the most recent one to older ones.
1360 When this option is used you cannot specify commits to
1361 exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
1362 nor <em>commit1…commit2</em> notations cannot be used).<br />
1363 With <em>--pretty</em> format other than oneline (for obvious reasons),
1364 this causes the output to have two extra lines of information
1365 taken from the reflog. By default, <em>commit@{Nth}</em> notation is
1366 used in the output. When the starting commit is specified as
1367 <em>commit@{now}</em>, output also uses <em>commit@{timestamp}</em> notation
1368 instead. Under <em>--pretty=oneline</em>, the commit message is
1369 prefixed with this information on the same line.
1370 This option cannot be combined with <em>--reverse</em>.
1372 </p>
1373 </dd>
1374 <dt>
1375 --merge
1376 </dt>
1377 <dd>
1378 <p>
1379 After a failed merge, show refs that touch files having a
1380 conflict and don't exist on all heads to merge.
1381 </p>
1382 </dd>
1383 <dt>
1384 --boundary
1385 </dt>
1386 <dd>
1387 <p>
1388 Output uninteresting commits at the boundary, which are usually
1389 not shown.
1390 </p>
1391 </dd>
1392 </dl></div>
1394 <div class="para"><p>Sometimes you are only interested in parts of the history, for example the
1395 commits modifying a particular <path>. But there are two parts of
1396 <em>History Simplification</em>, one part is selecting the commits and the other
1397 is how to do it, as there are various strategies to simplify the history.</p></div>
1400 <dt>
1401 <paths>
1402 </dt>
1403 <dd>
1404 <p>
1405 Commits modifying the given <paths> are selected.
1406 </p>
1407 </dd>
1408 <dt>
1409 --simplify-by-decoration
1410 </dt>
1411 <dd>
1412 <p>
1413 Commits that are referred by some branch or tag are selected.
1414 </p>
1415 </dd>
1416 </dl></div>
1417 <div class="para"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
1418 <div class="para"><p>The following options affect the way the simplification is performed:</p></div>
1420 <dt>
1421 Default mode
1422 </dt>
1423 <dd>
1424 <p>
1425 Simplifies the history to the simplest history explaining the
1426 final state of the tree. Simplest because it prunes some side
1427 branches if the end result is the same (i.e. merging branches
1428 with the same content)
1429 </p>
1430 </dd>
1431 <dt>
1432 --full-history
1433 </dt>
1434 <dd>
1435 <p>
1436 As the default mode but does not prune some history.
1437 </p>
1438 </dd>
1439 <dt>
1440 --dense
1441 </dt>
1442 <dd>
1443 <p>
1444 Only the selected commits are shown, plus some to have a
1445 meaningful history.
1446 </p>
1447 </dd>
1448 <dt>
1449 --sparse
1450 </dt>
1451 <dd>
1452 <p>
1453 All commits in the simplified history are shown.
1454 </p>
1455 </dd>
1456 <dt>
1457 --simplify-merges
1458 </dt>
1459 <dd>
1460 <p>
1461 Additional option to <em>--full-history</em> to remove some needless
1462 merges from the resulting history, as there are no selected
1463 commits contributing to this merge.
1464 </p>
1465 </dd>
1466 </dl></div>
1468 <div class="para"><p>Suppose you specified <tt>foo</tt> as the <paths>. We shall call commits
1469 that modify <tt>foo</tt> !TREESAME, and the rest TREESAME. (In a diff
1470 filtered for <tt>foo</tt>, they look different and equal, respectively.)</p></div>
1472 illustrate the differences between simplification settings. We assume
1473 that you are filtering for a file <tt>foo</tt> in this commit graph:</p></div>
1476 <pre><tt> .-A---M---N---O---P
1477 / / / / /
1478 I B C D E
1479 \ / / / /
1480 `-------------'</tt></pre>
1481 </div></div>
1483 each merge. The commits are:</p></div>
1485 <li>
1486 <p>
1487 <tt>I</tt> is the initial commit, in which <tt>foo</tt> exists with contents
1489 commits are compared to an empty tree, so <tt>I</tt> is !TREESAME.
1490 </p>
1491 </li>
1492 <li>
1493 <p>
1495 </p>
1496 </li>
1497 <li>
1498 <p>
1499 <tt>B</tt> contains the same change as <tt>A</tt>. Its merge <tt>M</tt> is trivial and
1500 hence TREESAME to all parents.
1501 </p>
1502 </li>
1503 <li>
1504 <p>
1506 so it is not TREESAME to any parent.
1507 </p>
1508 </li>
1509 <li>
1510 <p>
1513 </p>
1514 </li>
1515 <li>
1516 <p>
1519 TREESAME to all parents.
1520 </p>
1521 </li>
1522 </ul></div>
1524 commits based on whether <em>--full-history</em> and/or parent rewriting
1525 (via <em>--parents</em> or <em>--children</em>) are used. The following settings
1526 are available.</p></div>
1528 <dt>
1529 Default mode
1530 </dt>
1531 <dd>
1532 <p>
1533 Commits are included if they are not TREESAME to any parent
1534 (though this can be changed, see <em>--sparse</em> below). If the
1535 commit was a merge, and it was TREESAME to one parent, follow
1536 only that parent. (Even if there are several TREESAME
1537 parents, follow only one of them.) Otherwise, follow all
1538 parents.
1539 </p>
1543 <pre><tt> .-A---N---O
1544 / /
1545 I---------D</tt></pre>
1546 </div></div>
1548 available, removed <tt>B</tt> from consideration entirely. <tt>C</tt> was
1549 considered via <tt>N</tt>, but is TREESAME. Root commits are compared to an
1550 empty tree, so <tt>I</tt> is !TREESAME.</p></div>
1552 not affect the commits selected in default mode, so we have shown the
1553 parent lines.</p></div>
1554 </dd>
1555 <dt>
1556 --full-history without parent rewriting
1557 </dt>
1558 <dd>
1559 <p>
1560 This mode differs from the default in one point: always follow
1561 all parents of a merge, even if it is TREESAME to one of them.
1562 Even if more than one side of the merge has commits that are
1563 included, this does not imply that the merge itself is! In
1564 the example, we get
1565 </p>
1568 <pre><tt> I A B N D O</tt></pre>
1569 </div></div>
1570 <div class="para"><p><tt>P</tt> and <tt>M</tt> were excluded because they are TREESAME to a parent. <tt>E</tt>,
1571 <tt>C</tt> and <tt>B</tt> were all walked, but only <tt>B</tt> was !TREESAME, so the others
1572 do not appear.</p></div>
1574 about the parent/child relationships between the commits, so we show
1575 them disconnected.</p></div>
1576 </dd>
1577 <dt>
1578 --full-history with parent rewriting
1579 </dt>
1580 <dd>
1581 <p>
1582 Ordinary commits are only included if they are !TREESAME
1583 (though this can be changed, see <em>--sparse</em> below).
1584 </p>
1586 Along each parent, prune away commits that are not included
1587 themselves. This results in</p></div>
1590 <pre><tt> .-A---M---N---O---P
1591 / / / / /
1592 I B / D /
1593 \ / / / /
1594 `-------------'</tt></pre>
1595 </div></div>
1596 <div class="para"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt>
1597 was pruned away because it is TREESAME, but the parent list of P was
1598 rewritten to contain <tt>E</tt>'s parent <tt>I</tt>. The same happened for <tt>C</tt> and
1599 <tt>N</tt>. Note also that <tt>P</tt> was included despite being TREESAME.</p></div>
1600 </dd>
1601 </dl></div>
1603 affects inclusion:</p></div>
1605 <dt>
1606 --dense
1607 </dt>
1608 <dd>
1609 <p>
1610 Commits that are walked are included if they are not TREESAME
1611 to any parent.
1612 </p>
1613 </dd>
1614 <dt>
1615 --sparse
1616 </dt>
1617 <dd>
1618 <p>
1619 All commits that are walked are included.
1620 </p>
1621 <div class="para"><p>Note that without <em>--full-history</em>, this still simplifies merges: if
1622 one of the parents is TREESAME, we follow only that one, so the other
1623 sides of the merge are never walked.</p></div>
1624 </dd>
1625 </dl></div>
1628 <dt>
1629 --simplify-merges
1630 </dt>
1631 <dd>
1632 <p>
1633 First, build a history graph in the same way that
1634 <em>--full-history</em> with parent rewriting does (see above).
1635 </p>
1636 <div class="para"><p>Then simplify each commit <tt>C</tt> to its replacement <tt>C'</tt> in the final
1637 history according to the following rules:</p></div>
1639 <li>
1640 <p>
1641 Set <tt>C'</tt> to <tt>C</tt>.<br />
1642 </p>
1643 </li>
1644 <li>
1645 <p>
1646 Replace each parent <tt>P</tt> of <tt>C'</tt> with its simplification <tt>P'</tt>. In
1647 the process, drop parents that are ancestors of other parents, and
1648 remove duplicates.<br />
1649 </p>
1650 </li>
1651 <li>
1652 <p>
1653 If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has
1654 zero or >1 parents), a boundary commit, or !TREESAME, it remains.
1655 Otherwise, it is replaced with its only parent.
1656 </p>
1657 </li>
1658 </ul></div>
1660 <em>--full-history</em> with parent rewriting. The example turns into:</p></div>
1663 <pre><tt> .-A---M---N---O
1664 / / /
1665 I B D
1666 \ / /
1667 `---------'</tt></pre>
1668 </div></div>
1669 <div class="para"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div>
1671 <li>
1672 <p>
1673 <tt>N</tt>'s parent list had <tt>I</tt> removed, because it is an ancestor of the
1674 other parent <tt>M</tt>. Still, <tt>N</tt> remained because it is !TREESAME.<br />
1675 </p>
1676 </li>
1677 <li>
1678 <p>
1679 <tt>P</tt>'s parent list similarly had <tt>I</tt> removed. <tt>P</tt> was then
1680 removed completely, because it had one parent and is TREESAME.
1681 </p>
1682 </li>
1683 </ul></div>
1684 </dd>
1685 </dl></div>
1687 big picture of the topology of the history, by omitting commits
1688 that are not referenced by tags. Commits are marked as !TREESAME
1689 (in other words, kept after history simplification rules described
1690 above) if (1) they are referenced by tags, or (2) they change the
1691 contents of the paths given on the command line. All other
1692 commits are marked as TREESAME (subject to be simplified away).</p></div>
1694 <div class="para"><p>By default, the commits are shown in reverse chronological order.</p></div>
1696 <dt>
1697 --topo-order
1698 </dt>
1699 <dd>
1700 <p>
1701 This option makes them appear in topological order (i.e.
1702 descendant commits are shown before their parents).
1703 </p>
1704 </dd>
1705 <dt>
1706 --date-order
1707 </dt>
1708 <dd>
1709 <p>
1710 This option is similar to <em>--topo-order</em> in the sense that no
1711 parent comes before all of its children, but otherwise things
1712 are still ordered in the commit timestamp order.
1713 </p>
1714 </dd>
1715 <dt>
1716 --reverse
1717 </dt>
1718 <dd>
1719 <p>
1720 Output the commits in reverse order.
1721 Cannot be combined with <em>--walk-reflogs</em>.
1722 </p>
1723 </dd>
1724 </dl></div>
1726 <div class="para"><p>These options are mostly targeted for packing of git repositories.</p></div>
1728 <dt>
1729 --objects
1730 </dt>
1731 <dd>
1732 <p>
1733 Print the object IDs of any object referenced by the listed
1734 commits. <em>--objects foo ^bar</em> thus means "send me
1735 all object IDs which I need to download if I have the commit
1737 </p>
1738 </dd>
1739 <dt>
1740 --objects-edge
1741 </dt>
1742 <dd>
1743 <p>
1744 Similar to <em>--objects</em>, but also print the IDs of excluded
1747 objects in deltified form based on objects contained in these
1748 excluded commits to reduce network traffic.
1749 </p>
1750 </dd>
1751 <dt>
1752 --unpacked
1753 </dt>
1754 <dd>
1755 <p>
1756 Only useful with <em>--objects</em>; print the object IDs that are not
1757 in packs.
1758 </p>
1759 </dd>
1760 <dt>
1761 --no-walk
1762 </dt>
1763 <dd>
1764 <p>
1765 Only show the given revs, but do not traverse their ancestors.
1766 </p>
1767 </dd>
1768 <dt>
1769 --do-walk
1770 </dt>
1771 <dd>
1772 <p>
1773 Overrides a previous --no-walk.
1774 </p>
1775 </dd>
1776 </dl></div>
1777 </div>
1781 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
1782 inserted before the <em>Author:</em> line. This line begins with
1784 separated by spaces. Note that the listed commits may not
1785 necessarily be the list of the <strong>direct</strong> parent commits if you
1786 have limited your view of history: for example, if you are
1787 only interested in changes related to a certain directory or
1788 file.</p></div>
1791 <li>
1792 <p>
1793 <em>oneline</em>
1794 </p>
1797 <pre><tt><sha1> <title line></tt></pre>
1798 </div></div>
1800 </li>
1801 <li>
1802 <p>
1803 <em>short</em>
1804 </p>
1807 <pre><tt>commit <sha1>
1808 Author: <author></tt></pre>
1809 </div></div>
1812 <pre><tt><title line></tt></pre>
1813 </div></div>
1814 </li>
1815 <li>
1816 <p>
1817 <em>medium</em>
1818 </p>
1821 <pre><tt>commit <sha1>
1822 Author: <author>
1823 Date: <author date></tt></pre>
1824 </div></div>
1827 <pre><tt><title line></tt></pre>
1828 </div></div>
1831 <pre><tt><full commit message></tt></pre>
1832 </div></div>
1833 </li>
1834 <li>
1835 <p>
1836 <em>full</em>
1837 </p>
1840 <pre><tt>commit <sha1>
1841 Author: <author>
1842 Commit: <committer></tt></pre>
1843 </div></div>
1846 <pre><tt><title line></tt></pre>
1847 </div></div>
1850 <pre><tt><full commit message></tt></pre>
1851 </div></div>
1852 </li>
1853 <li>
1854 <p>
1855 <em>fuller</em>
1856 </p>
1859 <pre><tt>commit <sha1>
1860 Author: <author>
1861 AuthorDate: <author date>
1862 Commit: <committer>
1863 CommitDate: <committer date></tt></pre>
1864 </div></div>
1867 <pre><tt><title line></tt></pre>
1868 </div></div>
1871 <pre><tt><full commit message></tt></pre>
1872 </div></div>
1873 </li>
1874 <li>
1875 <p>
1876 <em>email</em>
1877 </p>
1880 <pre><tt>From <sha1> <date>
1881 From: <author>
1882 Date: <author date>
1883 Subject: [PATCH] <title line></tt></pre>
1884 </div></div>
1887 <pre><tt><full commit message></tt></pre>
1888 </div></div>
1889 </li>
1890 <li>
1891 <p>
1892 <em>raw</em>
1893 </p>
1895 stored in the commit object. Notably, the SHA1s are
1896 displayed in full, regardless of whether --abbrev or
1897 --no-abbrev are used, and <em>parents</em> information show the
1898 true parent commits, without taking grafts nor history
1899 simplification into account.</p></div>
1900 </li>
1901 <li>
1902 <p>
1903 <em>format:</em>
1904 </p>
1906 you want to show. It works a little bit like printf format,
1907 with the notable exception that you get a newline with <em>%n</em>
1908 instead of <em>\n</em>.</p></div>
1909 <div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1910 would show something like this:</p></div>
1913 <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
1914 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
1915 </tt></pre>
1916 </div></div>
1919 <li>
1920 <p>
1921 <em>%H</em>: commit hash
1922 </p>
1923 </li>
1924 <li>
1925 <p>
1926 <em>%h</em>: abbreviated commit hash
1927 </p>
1928 </li>
1929 <li>
1930 <p>
1931 <em>%T</em>: tree hash
1932 </p>
1933 </li>
1934 <li>
1935 <p>
1936 <em>%t</em>: abbreviated tree hash
1937 </p>
1938 </li>
1939 <li>
1940 <p>
1941 <em>%P</em>: parent hashes
1942 </p>
1943 </li>
1944 <li>
1945 <p>
1946 <em>%p</em>: abbreviated parent hashes
1947 </p>
1948 </li>
1949 <li>
1950 <p>
1951 <em>%an</em>: author name
1952 </p>
1953 </li>
1954 <li>
1955 <p>
1956 <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>)
1957 </p>
1958 </li>
1959 <li>
1960 <p>
1961 <em>%ae</em>: author email
1962 </p>
1963 </li>
1964 <li>
1965 <p>
1966 <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>)
1967 </p>
1968 </li>
1969 <li>
1970 <p>
1971 <em>%ad</em>: author date (format respects --date= option)
1972 </p>
1973 </li>
1974 <li>
1975 <p>
1976 <em>%aD</em>: author date, RFC2822 style
1977 </p>
1978 </li>
1979 <li>
1980 <p>
1981 <em>%ar</em>: author date, relative
1982 </p>
1983 </li>
1984 <li>
1985 <p>
1986 <em>%at</em>: author date, UNIX timestamp
1987 </p>
1988 </li>
1989 <li>
1990 <p>
1991 <em>%ai</em>: author date, ISO 8601 format
1992 </p>
1993 </li>
1994 <li>
1995 <p>
1996 <em>%cn</em>: committer name
1997 </p>
1998 </li>
1999 <li>
2000 <p>
2001 <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>)
2002 </p>
2003 </li>
2004 <li>
2005 <p>
2006 <em>%ce</em>: committer email
2007 </p>
2008 </li>
2009 <li>
2010 <p>
2011 <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>)
2012 </p>
2013 </li>
2014 <li>
2015 <p>
2016 <em>%cd</em>: committer date
2017 </p>
2018 </li>
2019 <li>
2020 <p>
2021 <em>%cD</em>: committer date, RFC2822 style
2022 </p>
2023 </li>
2024 <li>
2025 <p>
2026 <em>%cr</em>: committer date, relative
2027 </p>
2028 </li>
2029 <li>
2030 <p>
2031 <em>%ct</em>: committer date, UNIX timestamp
2032 </p>
2033 </li>
2034 <li>
2035 <p>
2036 <em>%ci</em>: committer date, ISO 8601 format
2037 </p>
2038 </li>
2039 <li>
2040 <p>
2042 </p>
2043 </li>
2044 <li>
2045 <p>
2046 <em>%e</em>: encoding
2047 </p>
2048 </li>
2049 <li>
2050 <p>
2051 <em>%s</em>: subject
2052 </p>
2053 </li>
2054 <li>
2055 <p>
2056 <em>%f</em>: sanitized subject line, suitable for a filename
2057 </p>
2058 </li>
2059 <li>
2060 <p>
2061 <em>%b</em>: body
2062 </p>
2063 </li>
2064 <li>
2065 <p>
2066 <em>%N</em>: commit notes
2067 </p>
2068 </li>
2069 <li>
2070 <p>
2071 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
2072 </p>
2073 </li>
2074 <li>
2075 <p>
2076 <em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt>
2077 </p>
2078 </li>
2079 <li>
2080 <p>
2081 <em>%gs</em>: reflog subject
2082 </p>
2083 </li>
2084 <li>
2085 <p>
2086 <em>%Cred</em>: switch color to red
2087 </p>
2088 </li>
2089 <li>
2090 <p>
2091 <em>%Cgreen</em>: switch color to green
2092 </p>
2093 </li>
2094 <li>
2095 <p>
2096 <em>%Cblue</em>: switch color to blue
2097 </p>
2098 </li>
2099 <li>
2100 <p>
2101 <em>%Creset</em>: reset color
2102 </p>
2103 </li>
2104 <li>
2105 <p>
2106 <em>%C(…)</em>: color specification, as described in color.branch.* config option
2107 </p>
2108 </li>
2109 <li>
2110 <p>
2111 <em>%m</em>: left, right or boundary mark
2112 </p>
2113 </li>
2114 <li>
2115 <p>
2116 <em>%n</em>: newline
2117 </p>
2118 </li>
2119 <li>
2120 <p>
2121 <em>%%</em>: a raw <em>%</em>
2122 </p>
2123 </li>
2124 <li>
2125 <p>
2126 <em>%x00</em>: print a byte from a hex code
2127 </p>
2128 </li>
2129 <li>
2130 <p>
2131 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
2133 </p>
2134 </li>
2135 </ul></div>
2136 </li>
2137 </ul></div>
2139 <table><tr>
2142 </td>
2144 revision traversal engine. For example, the <tt>%g*</tt> reflog options will
2145 insert an empty string unless we are traversing reflog entries (e.g., by
2147 format if <tt>--decorate</tt> was not already provided on the command line.</td>
2148 </tr></table>
2149 </div>
2150 <div class="para"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
2151 is inserted immediately before the expansion if and only if the
2152 placeholder expands to a non-empty string.</p></div>
2153 <div class="para"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
2154 immediately precede the expansion are deleted if and only if the
2155 placeholder expands to an empty string.</p></div>
2157 <li>
2158 <p>
2159 <em>tformat:</em>
2160 </p>
2161 <div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
2163 other words, each commit has the message terminator character (usually a
2164 newline) appended, rather than a separator placed between entries.
2165 This means that the final entry of a single-line format will be properly
2167 For example:</p></div>
2170 <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
2172 4da45be
2173 7134973 -- NO NEWLINE
2175 $ git log -2 --pretty=tformat:%h 4da45bef \
2177 4da45be
2178 7134973</tt></pre>
2179 </div></div>
2180 <div class="para"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
2181 as if it has <tt>tformat:</tt> in front of it. For example, these two are
2182 equivalent:</p></div>
2185 <pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef
2186 $ git log -2 --pretty=%h 4da45bef</tt></pre>
2187 </div></div>
2188 </li>
2189 </ul></div>
2190 </div>
2196 do not produce the output described above; instead they produce a
2197 patch file. You can customize the creation of such patches via the
2198 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
2200 diff format.</p></div>
2202 <li>
2203 <p>
2205 this:
2206 </p>
2209 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2210 </div></div>
2211 <div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2212 involved. Especially, even for a creation or a deletion,
2213 <tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2215 name of the source file of the rename/copy and the name of
2216 the file that rename/copy produces, respectively.</p></div>
2217 </li>
2218 <li>
2219 <p>
2220 It is followed by one or more extended header lines:
2221 </p>
2224 <pre><tt>old mode <mode>
2225 new mode <mode>
2226 deleted file mode <mode>
2227 new file mode <mode>
2228 copy from <path>
2229 copy to <path>
2230 rename from <path>
2231 rename to <path>
2232 similarity index <number>
2233 dissimilarity index <number>
2234 index <hash>..<hash> <mode></tt></pre>
2235 </div></div>
2236 </li>
2237 <li>
2238 <p>
2239 TAB, LF, double quote and backslash characters in pathnames
2241 If there is need for such substitution then the whole
2242 pathname is put in double quotes.
2243 </p>
2244 </li>
2245 </ol></div>
2247 the dissimilarity index is the percentage of changed lines. It
2248 is a rounded down integer, followed by a percent sign. The
2249 similarity index value of 100% is thus reserved for two equal
2250 files, while 100% dissimilarity means that no line from the old
2251 file made it into the new one.</p></div>
2252 </div>
2257 with "git log -p", this is the default format.
2261 <pre><tt>diff --combined describe.c
2262 index fabadb8,cc95eb0..4866510
2263 --- a/describe.c
2264 +++ b/describe.c
2267 }
2269 - static void describe(char *arg)
2270 -static void describe(struct commit *cmit, int last_one)
2271 ++static void describe(char *arg, int last_one)
2272 {
2273 + unsigned char sha1[20];
2274 + struct commit *cmit;
2275 struct commit_list *list;
2276 static int initialized = 0;
2277 struct commit_name *n;
2280 + usage(describe_usage);
2281 + cmit = lookup_commit_reference(sha1);
2282 + if (!cmit)
2283 + usage(describe_usage);
2284 +
2285 if (!initialized) {
2286 initialized = 1;
2287 for_each_ref(get_name);</tt></pre>
2288 </div></div>
2290 <li>
2291 <p>
2292 It is preceded with a "git diff" header, that looks like
2294 </p>
2298 </div></div>
2303 </div></div>
2304 </li>
2305 <li>
2306 <p>
2307 It is followed by one or more extended header lines
2308 (this example shows a merge with two parents):
2309 </p>
2316 </div></div>
2317 <div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
2319 information about detected contents movement (renames and
2320 copying detection) are designed to work with diff of two
2322 </li>
2323 <li>
2324 <p>
2325 It is followed by two-line from-file/to-file header
2326 </p>
2329 <pre><tt>--- a/file
2330 +++ b/file</tt></pre>
2331 </div></div>
2334 files.</p></div>
2335 </li>
2336 <li>
2337 <p>
2338 Chunk header format is modified to prevent people from
2340 was created for review of merge commit changes, and was not
2341 meant for apply. The change is similar to the change in the
2343 </p>
2346 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
2347 </div></div>
2349 header for combined diff format.</p></div>
2350 </li>
2351 </ol></div>
2356 compares two or more files file1, file2,… with one file X, and
2357 shows how X differs from each of fileN. One column for each of
2358 fileN is prepended to the output line to note how X's line is
2359 different from it.</p></div>
2362 in the column N means that the line appears in the result,
2363 and fileN does not have that line (in other words, the line was
2364 added, from the point of view of that parent).</p></div>
2368 in either file1 nor file2). Also eight other lines are the same
2371 merge commit with the merge result (i.e. file1..fileN are the
2373 two unresolved merge parents with the working tree file
2376 </div>
2380 <dt>
2381 git log --no-merges
2382 </dt>
2383 <dd>
2384 <p>
2385 Show the whole commit history, but skip any merges
2386 </p>
2387 </dd>
2388 <dt>
2389 git log v2.6.12.. include/scsi drivers/scsi
2390 </dt>
2391 <dd>
2392 <p>
2394 in the include/scsi or drivers/scsi subdirectories
2395 </p>
2396 </dd>
2397 <dt>
2399 </dt>
2400 <dd>
2401 <p>
2405 </p>
2406 </dd>
2407 <dt>
2408 git log --name-status release..test
2409 </dt>
2410 <dd>
2411 <p>
2412 Show the commits that are in the "test" branch but not yet
2413 in the "release" branch, along with the list of paths
2414 each commit modifies.
2415 </p>
2416 </dd>
2417 <dt>
2418 git log --follow builtin-rev-list.c
2419 </dt>
2420 <dd>
2421 <p>
2422 Shows the commits that changed builtin-rev-list.c, including
2423 those commits that occurred before the file was given its
2424 present name.
2425 </p>
2426 </dd>
2427 </dl></div>
2428 </div>
2433 <li>
2434 <p>
2435 The pathnames recorded in the index and in the tree objects
2436 are treated as uninterpreted sequences of non-NUL bytes.
2437 What readdir(2) returns are what are recorded and compared
2438 with the data git keeps track of, which in turn are expected
2440 thing as pathname encoding translation.
2441 </p>
2442 </li>
2443 <li>
2444 <p>
2445 The contents of the blob objects are uninterpreted sequences
2446 of bytes. There is no encoding translation at the core
2447 level.
2448 </p>
2449 </li>
2450 <li>
2451 <p>
2452 The commit log messages are uninterpreted sequences of non-NUL
2453 bytes.
2454 </p>
2455 </li>
2456 </ul></div>
2458 in UTF-8, both the core and git Porcelain are designed not to
2459 force UTF-8 on projects. If all participants of a particular
2460 project find it more convenient to use legacy encodings, git
2461 does not forbid it. However, there are a few things to keep in
2462 mind.</p></div>
2464 <li>
2465 <p>
2467 a warning if the commit log message given to it does not look
2468 like a valid UTF-8 string, unless you explicitly say your
2469 project uses a legacy encoding. The way to say this is to
2471 </p>
2474 <pre><tt>[i18n]
2476 </div></div>
2479 help other people who look at them later. Lack of this header
2481 </li>
2482 <li>
2483 <p>
2486 log message into UTF-8 unless otherwise specified. You can
2487 specify the desired output encoding with
2489 </p>
2492 <pre><tt>[i18n]
2494 </div></div>
2497 </li>
2498 </ol></div>
2500 message when a commit is made to force UTF-8 at the commit
2501 object level, because re-coding to UTF-8 is not necessarily a
2502 reversible operation.</p></div>
2503 </div>
2507 </div>
2510 <div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
2511 </div>
2515 </div>
2519 </div>
2520 </div>
2521 </body>
2522 </html>