| blob | 6ce5a54f9240a3ac9852d176dfdc181551199a9f |
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-log(1) Manual Page
407 </h1>
410 <p>git-log -
411 Show commit logs
412 </p>
413 </div>
414 </div>
417 <div class="paragraph"><p><em>git log</em> [<options>] [<since>..<until>] [[--] <path>…]</p></div>
418 </div>
423 command to control what is shown and how, and options applicable to
425 each commit introduces are shown.</p></div>
426 </div>
432 </dt>
433 <dd>
434 <p>
435 Limits the number of commits to show.
436 Note that this is a commit limiting option, see below.
437 </p>
438 </dd>
441 </dt>
442 <dd>
443 <p>
444 Show only commits between the named two commits. When
449 </p>
450 </dd>
452 --follow
453 </dt>
454 <dd>
455 <p>
456 Continue listing the history of a file beyond renames
457 (works only for a single file).
458 </p>
459 </dd>
461 --no-decorate
462 </dt>
464 --decorate[=short|full|no]
465 </dt>
466 <dd>
467 <p>
471 full ref name (including prefix) will be printed. The default option
473 </p>
474 </dd>
476 --source
477 </dt>
478 <dd>
479 <p>
480 Print out the ref name given on the command line by which each
481 commit was reached.
482 </p>
483 </dd>
485 --full-diff
486 </dt>
487 <dd>
488 <p>
489 Without this flag, "git log -p <path>…" shows commits that
490 touch the specified paths, and diffs about the same specified
491 paths. With this, the full diff is shown for commits that touch
492 the specified paths; this means that "<path>…" limits only
493 commits, and doesn’t limit diff for those commits.
494 </p>
496 produced by --stat etc.</p></div>
497 </dd>
499 --log-size
500 </dt>
501 <dd>
502 <p>
503 Before the log message print out its size in bytes. Intended
504 mainly for porcelain tools consumption. If git is unable to
505 produce a valid value size is set to zero.
506 Note that only message is considered, if also a diff is shown
507 its size is not included.
508 </p>
509 </dd>
512 </dt>
513 <dd>
514 <p>
515 Show only commits that affect any of the specified paths. To
516 prevent confusion with options and branch names, paths may need
517 to be prefixed with "-- " to separate them from options or
518 refnames.
519 </p>
520 </dd>
521 </dl></div>
524 special notations explained in the description, additional commit
525 limiting may be applied. Note that they are applied before commit
530 </dt>
533 </dt>
534 <dd>
535 <p>
536 Limit the number of commits to output.
537 </p>
538 </dd>
541 </dt>
542 <dd>
543 <p>
545 </p>
546 </dd>
549 </dt>
552 </dt>
553 <dd>
554 <p>
555 Show commits more recent than a specific date.
556 </p>
557 </dd>
560 </dt>
563 </dt>
564 <dd>
565 <p>
566 Show commits older than a specific date.
567 </p>
568 </dd>
571 </dt>
574 </dt>
575 <dd>
576 <p>
577 Limit the commits output to ones with author/committer
578 header lines that match the specified pattern (regular expression).
579 </p>
580 </dd>
583 </dt>
584 <dd>
585 <p>
586 Limit the commits output to ones with log message that
587 matches the specified pattern (regular expression).
588 </p>
589 </dd>
591 --all-match
592 </dt>
593 <dd>
594 <p>
595 Limit the commits output to ones that match all given --grep,
596 --author and --committer instead of ones that match at least one.
597 </p>
598 </dd>
600 -i
601 </dt>
603 --regexp-ignore-case
604 </dt>
605 <dd>
606 <p>
607 Match the regexp limiting patterns without regard to letters case.
608 </p>
609 </dd>
611 -E
612 </dt>
614 --extended-regexp
615 </dt>
616 <dd>
617 <p>
618 Consider the limiting patterns to be extended regular expressions
619 instead of the default basic regular expressions.
620 </p>
621 </dd>
623 -F
624 </dt>
626 --fixed-strings
627 </dt>
628 <dd>
629 <p>
630 Consider the limiting patterns to be fixed strings (don’t interpret
631 pattern as a regular expression).
632 </p>
633 </dd>
635 --remove-empty
636 </dt>
637 <dd>
638 <p>
639 Stop when a given path disappears from the tree.
640 </p>
641 </dd>
643 --merges
644 </dt>
645 <dd>
646 <p>
648 </p>
649 </dd>
651 --no-merges
652 </dt>
653 <dd>
654 <p>
655 Do not print commits with more than one parent. This is
657 </p>
658 </dd>
661 </dt>
664 </dt>
666 --no-min-parents
667 </dt>
669 --no-max-parents
670 </dt>
671 <dd>
672 <p>
673 Show only commits which have at least (or at most) that many
677 </p>
678 <div class="paragraph"><p><tt>--no-min-parents</tt> and <tt>--no-max-parents</tt> reset these limits (to no limit)
681 </dd>
683 --first-parent
684 </dt>
685 <dd>
686 <p>
687 Follow only the first parent commit upon seeing a merge
688 commit. This option can give a better overview when
689 viewing the evolution of a particular topic branch,
690 because merges into a topic branch tend to be only about
691 adjusting to updated upstream from time to time, and
692 this option allows you to ignore the individual commits
693 brought in to your history by such a merge.
694 </p>
695 </dd>
697 --not
698 </dt>
699 <dd>
700 <p>
703 </p>
704 </dd>
706 --all
707 </dt>
708 <dd>
709 <p>
712 </p>
713 </dd>
716 </dt>
717 <dd>
718 <p>
723 </p>
724 </dd>
727 </dt>
728 <dd>
729 <p>
734 </p>
735 </dd>
738 </dt>
739 <dd>
740 <p>
743 remote-tracking branches to ones matching given shell glob.
744 If pattern lacks <em>?</em>, <em><strong></em>, or <em>[</em>, <em>/</strong></em> at the end is implied.
745 </p>
746 </dd>
749 </dt>
750 <dd>
751 <p>
756 </p>
757 </dd>
759 --bisect
760 </dt>
761 <dd>
762 <p>
766 line.
767 </p>
768 </dd>
770 --stdin
771 </dt>
772 <dd>
773 <p>
776 seen, stop reading commits and start reading paths to limit the
777 result.
778 </p>
779 </dd>
781 --cherry-mark
782 </dt>
783 <dd>
784 <p>
787 </p>
788 </dd>
790 --cherry-pick
791 </dt>
792 <dd>
793 <p>
794 Omit any commit that introduces the same change as
795 another commit on the "other side" when the set of
796 commits are limited with symmetric difference.
797 </p>
798 <div class="paragraph"><p>For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way
799 to list all commits on only one side of them is with
802 from the other branch (for example, "3rd on b" may be cherry-picked
803 from branch A). With this option, such pairs of commits are
804 excluded from the output.</p></div>
805 </dd>
807 --left-only
808 </dt>
810 --right-only
811 </dt>
812 <dd>
813 <p>
814 List only commits on the respective side of a symmetric range,
817 </p>
818 <div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A…B</tt> omits those
822 list.</p></div>
823 </dd>
825 --cherry
826 </dt>
827 <dd>
828 <p>
830 limit the output to the commits on our side and mark those that
831 have been applied to the other side of a forked history with
834 </p>
835 </dd>
837 -g
838 </dt>
840 --walk-reflogs
841 </dt>
842 <dd>
843 <p>
844 Instead of walking the commit ancestry chain, walk
845 reflog entries from the most recent one to older ones.
846 When this option is used you cannot specify commits to
849 </p>
850 <div class="paragraph"><p>With <em>--pretty</em> format other than oneline (for obvious reasons),
851 this causes the output to have two extra lines of information
853 used in the output. When the starting commit is specified as
856 prefixed with this information on the same line.
859 </dd>
861 --merge
862 </dt>
863 <dd>
864 <p>
865 After a failed merge, show refs that touch files having a
866 conflict and don’t exist on all heads to merge.
867 </p>
868 </dd>
870 --boundary
871 </dt>
872 <dd>
873 <p>
874 Output uninteresting commits at the boundary, which are usually
875 not shown.
876 </p>
877 </dd>
878 </dl></div>
880 <div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the
883 is how to do it, as there are various strategies to simplify the history.</p></div>
888 </dt>
889 <dd>
890 <p>
892 </p>
893 </dd>
895 --simplify-by-decoration
896 </dt>
897 <dd>
898 <p>
899 Commits that are referred by some branch or tag are selected.
900 </p>
901 </dd>
902 </dl></div>
903 <div class="paragraph"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
904 <div class="paragraph"><p>The following options affect the way the simplification is performed:</p></div>
907 Default mode
908 </dt>
909 <dd>
910 <p>
911 Simplifies the history to the simplest history explaining the
912 final state of the tree. Simplest because it prunes some side
913 branches if the end result is the same (i.e. merging branches
914 with the same content)
915 </p>
916 </dd>
918 --full-history
919 </dt>
920 <dd>
921 <p>
922 As the default mode but does not prune some history.
923 </p>
924 </dd>
926 --dense
927 </dt>
928 <dd>
929 <p>
930 Only the selected commits are shown, plus some to have a
931 meaningful history.
932 </p>
933 </dd>
935 --sparse
936 </dt>
937 <dd>
938 <p>
939 All commits in the simplified history are shown.
940 </p>
941 </dd>
943 --simplify-merges
944 </dt>
945 <dd>
946 <p>
948 merges from the resulting history, as there are no selected
949 commits contributing to this merge.
950 </p>
951 </dd>
953 --ancestry-path
954 </dt>
955 <dd>
956 <p>
962 </p>
963 </dd>
964 </dl></div>
966 <div class="paragraph"><p>Suppose you specified <tt>foo</tt> as the <paths>. We shall call commits
970 illustrate the differences between simplification settings. We assume
974 <pre><tt> .-A---M---N---O---P
975 / / / / /
976 I B C D E
977 \ / / / /
978 `-------------'</tt></pre>
979 </div></div>
980 <div class="paragraph"><p>The horizontal line of history A—P is taken to be the first parent of
981 each merge. The commits are:</p></div>
983 <li>
984 <p>
988 </p>
989 </li>
990 <li>
991 <p>
993 </p>
994 </li>
995 <li>
996 <p>
998 hence TREESAME to all parents.
999 </p>
1000 </li>
1001 <li>
1002 <p>
1004 so it is not TREESAME to any parent.
1005 </p>
1006 </li>
1007 <li>
1008 <p>
1011 </p>
1012 </li>
1013 <li>
1014 <p>
1017 TREESAME to all parents.
1018 </p>
1019 </li>
1020 </ul></div>
1021 <div class="paragraph"><p><em>rev-list</em> walks backwards through history, including or excluding
1024 are available.</p></div>
1027 Default mode
1028 </dt>
1029 <dd>
1030 <p>
1031 Commits are included if they are not TREESAME to any parent
1033 commit was a merge, and it was TREESAME to one parent, follow
1034 only that parent. (Even if there are several TREESAME
1035 parents, follow only one of them.) Otherwise, follow all
1036 parents.
1037 </p>
1041 <pre><tt> .-A---N---O
1042 / / /
1043 I---------D</tt></pre>
1044 </div></div>
1049 <div class="paragraph"><p>Parent/child relations are only visible with --parents, but that does
1050 not affect the commits selected in default mode, so we have shown the
1051 parent lines.</p></div>
1052 </dd>
1054 --full-history without parent rewriting
1055 </dt>
1056 <dd>
1057 <p>
1058 This mode differs from the default in one point: always follow
1059 all parents of a merge, even if it is TREESAME to one of them.
1060 Even if more than one side of the merge has commits that are
1061 included, this does not imply that the merge itself is! In
1062 the example, we get
1063 </p>
1067 </div></div>
1068 <div class="paragraph"><p><tt>P</tt> and <tt>M</tt> were excluded because they are TREESAME to a parent. <tt>E</tt>,
1070 do not appear.</p></div>
1071 <div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk
1072 about the parent/child relationships between the commits, so we show
1073 them disconnected.</p></div>
1074 </dd>
1076 --full-history with parent rewriting
1077 </dt>
1078 <dd>
1079 <p>
1080 Ordinary commits are only included if they are !TREESAME
1082 </p>
1084 Along each parent, prune away commits that are not included
1085 themselves. This results in</p></div>
1088 <pre><tt> .-A---M---N---O---P
1089 / / / / /
1090 I B / D /
1091 \ / / / /
1092 `-------------'</tt></pre>
1093 </div></div>
1094 <div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt>
1095 was pruned away because it is TREESAME, but the parent list of P was
1098 </dd>
1099 </dl></div>
1101 affects inclusion:</p></div>
1104 --dense
1105 </dt>
1106 <dd>
1107 <p>
1108 Commits that are walked are included if they are not TREESAME
1109 to any parent.
1110 </p>
1111 </dd>
1113 --sparse
1114 </dt>
1115 <dd>
1116 <p>
1117 All commits that are walked are included.
1118 </p>
1119 <div class="paragraph"><p>Note that without <em>--full-history</em>, this still simplifies merges: if
1120 one of the parents is TREESAME, we follow only that one, so the other
1121 sides of the merge are never walked.</p></div>
1122 </dd>
1124 --simplify-merges
1125 </dt>
1126 <dd>
1127 <p>
1128 First, build a history graph in the same way that
1130 </p>
1131 <div class="paragraph"><p>Then simplify each commit ‘C` to its replacement <tt>C’</tt> in the final
1132 history according to the following rules:</p></div>
1134 <li>
1135 <p>
1137 </p>
1138 </li>
1139 <li>
1140 <p>
1141 Replace each parent ‘P` of <tt>C’</tt> with its simplification ‘P’`. In
1142 the process, drop parents that are ancestors of other parents, and
1143 remove duplicates.
1144 </p>
1145 </li>
1146 <li>
1147 <p>
1150 Otherwise, it is replaced with its only parent.
1151 </p>
1152 </li>
1153 </ul></div>
1158 <pre><tt> .-A---M---N---O
1159 / / /
1160 I B D
1161 \ / /
1162 `---------'</tt></pre>
1163 </div></div>
1164 <div class="paragraph"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div>
1166 <li>
1167 <p>
1170 </p>
1171 </li>
1172 <li>
1173 <p>
1175 removed completely, because it had one parent and is TREESAME.
1176 </p>
1177 </li>
1178 </ul></div>
1179 </dd>
1180 </dl></div>
1184 --ancestry-path
1185 </dt>
1186 <dd>
1187 <p>
1188 Limit the displayed commits to those directly on the ancestry
1190 range. I.e. only display commits that are ancestor of the "to"
1191 commit, and descendants of the "from" commit.
1192 </p>
1193 <div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
1196 <pre><tt> D---E-------F
1197 / \ \
1198 B---C---G---H---I---J
1199 / \
1200 A-------K---------------L--M</tt></pre>
1201 </div></div>
1202 <div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <tt>M</tt>,
1205 that "what does <tt>M</tt> have that did not exist in <tt>D</tt>". The result in this
1207 of course).</p></div>
1208 <div class="paragraph"><p>When we want to find out what commits in <tt>M</tt> are contaminated with the
1215 <pre><tt> E-------F
1216 \ \
1217 G---H---I---J
1218 \
1219 L--M</tt></pre>
1220 </div></div>
1221 </dd>
1222 </dl></div>
1223 <div class="paragraph"><p>The <em>--simplify-by-decoration</em> option allows you to view only the
1224 big picture of the topology of the history, by omitting commits
1225 that are not referenced by tags. Commits are marked as !TREESAME
1226 (in other words, kept after history simplification rules described
1228 contents of the paths given on the command line. All other
1229 commits are marked as TREESAME (subject to be simplified away).</p></div>
1231 <div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>
1234 --topo-order
1235 </dt>
1236 <dd>
1237 <p>
1238 This option makes them appear in topological order (i.e.
1239 descendant commits are shown before their parents).
1240 </p>
1241 </dd>
1243 --date-order
1244 </dt>
1245 <dd>
1246 <p>
1248 parent comes before all of its children, but otherwise things
1249 are still ordered in the commit timestamp order.
1250 </p>
1251 </dd>
1253 --reverse
1254 </dt>
1255 <dd>
1256 <p>
1257 Output the commits in reverse order.
1259 </p>
1260 </dd>
1261 </dl></div>
1263 <div class="paragraph"><p>These options are mostly targeted for packing of git repositories.</p></div>
1266 --objects
1267 </dt>
1268 <dd>
1269 <p>
1270 Print the object IDs of any object referenced by the listed
1272 all object IDs which I need to download if I have the commit
1273 object <em>bar</em>, but not <em>foo</em>".
1274 </p>
1275 </dd>
1277 --objects-edge
1278 </dt>
1279 <dd>
1280 <p>
1282 commits prefixed with a "-" character. This is used by
1284 objects in deltified form based on objects contained in these
1285 excluded commits to reduce network traffic.
1286 </p>
1287 </dd>
1289 --unpacked
1290 </dt>
1291 <dd>
1292 <p>
1294 in packs.
1295 </p>
1296 </dd>
1298 --no-walk
1299 </dt>
1300 <dd>
1301 <p>
1302 Only show the given revs, but do not traverse their ancestors.
1303 </p>
1304 </dd>
1306 --do-walk
1307 </dt>
1308 <dd>
1309 <p>
1310 Overrides a previous --no-walk.
1311 </p>
1312 </dd>
1313 </dl></div>
1318 </dt>
1321 </dt>
1322 <dd>
1323 <p>
1324 Pretty-print the contents of the commit logs in a given format,
1326 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See
1327 the "PRETTY FORMATS" section for some additional details for each
1329 </p>
1332 </dd>
1334 --abbrev-commit
1335 </dt>
1336 <dd>
1337 <p>
1338 Instead of showing the full 40-byte hexadecimal commit object
1339 name, show only a partial prefix. Non default number of
1340 digits can be specified with "--abbrev=<n>" (which also modifies
1341 diff output, if it is displayed).
1342 </p>
1345 </dd>
1347 --oneline
1348 </dt>
1349 <dd>
1350 <p>
1351 This is a shorthand for "--pretty=oneline --abbrev-commit"
1352 used together.
1353 </p>
1354 </dd>
1357 </dt>
1358 <dd>
1359 <p>
1360 The commit objects record the encoding used for the log message
1361 in their encoding header; this option can be used to tell the
1362 command to re-code the commit log message in the encoding
1363 preferred by the user. For non plumbing commands this
1364 defaults to UTF-8.
1365 </p>
1366 </dd>
1368 --no-notes
1369 </dt>
1372 </dt>
1373 <dd>
1374 <p>
1376 commit, when showing the commit log message. This is the default
1379 given on the command line.
1380 </p>
1381 <div class="paragraph"><p>With an optional argument, add this ref to the list of notes. The ref
1383 </dd>
1385 --[no-]standard-notes
1386 </dt>
1387 <dd>
1388 <p>
1389 Enable or disable populating the notes ref list from the
1391 corresponding environment overrides). Enabled by default.
1393 </p>
1394 </dd>
1396 --relative-date
1397 </dt>
1398 <dd>
1399 <p>
1401 </p>
1402 </dd>
1404 --date=(relative|local|default|iso|rfc|short|raw)
1405 </dt>
1406 <dd>
1407 <p>
1408 Only takes effect for dates shown in human-readable format, such
1410 value for log command’s --date option.
1411 </p>
1414 <div class="paragraph"><p><tt>--date=local</tt> shows timestamps in user’s local timezone.</p></div>
1415 <div class="paragraph"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div>
1416 <div class="paragraph"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822
1417 format, often found in E-mail messages.</p></div>
1418 <div class="paragraph"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div>
1419 <div class="paragraph"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div>
1422 </dd>
1424 --parents
1425 </dt>
1426 <dd>
1427 <p>
1428 Print also the parents of the commit (in the form "commit parent…").
1430 </p>
1431 </dd>
1433 --children
1434 </dt>
1435 <dd>
1436 <p>
1437 Print also the children of the commit (in the form "commit child…").
1439 </p>
1440 </dd>
1442 --left-right
1443 </dt>
1444 <dd>
1445 <p>
1446 Mark which side of a symmetric diff a commit is reachable from.
1450 </p>
1454 <pre><tt> y---b---b branch B
1455 / \ /
1456 / .
1457 / / \
1458 o---x---a---a branch A</tt></pre>
1459 </div></div>
1463 <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B
1469 -yyyyyyy... 1st on b
1471 </div></div>
1472 </dd>
1474 --graph
1475 </dt>
1476 <dd>
1477 <p>
1478 Draw a text-based graphical representation of the commit history
1479 on the left hand side of the output. This may cause extra lines
1480 to be printed in between commits, in order for the graph history
1481 to be drawn properly.
1482 </p>
1483 <div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>
1486 </dd>
1487 </dl></div>
1490 Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
1491 options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
1494 -c
1495 </dt>
1496 <dd>
1497 <p>
1498 With this option, diff output for a merge commit
1499 shows the differences from each of the parents to the merge result
1500 simultaneously instead of showing pairwise diff between a parent
1501 and the result one at a time. Furthermore, it lists only files
1502 which were modified from all parents.
1503 </p>
1504 </dd>
1506 --cc
1507 </dt>
1508 <dd>
1509 <p>
1511 patch output by omitting uninteresting hunks whose contents in
1512 the parents have only two variants and the merge result picks
1513 one of them without modification.
1514 </p>
1515 </dd>
1517 -m
1518 </dt>
1519 <dd>
1520 <p>
1521 This flag makes the merge commits show the full diff like
1522 regular commits; for each merge parent, a separate log entry
1523 and diff is generated. An exception is that only diff against
1525 in that case, the output represents the changes the merge
1527 </p>
1528 </dd>
1530 -r
1531 </dt>
1532 <dd>
1533 <p>
1534 Show recursive diffs.
1535 </p>
1536 </dd>
1538 -t
1539 </dt>
1540 <dd>
1541 <p>
1543 </p>
1544 </dd>
1546 -s
1547 </dt>
1548 <dd>
1549 <p>
1550 Suppress diff output.
1551 </p>
1552 </dd>
1553 </dl></div>
1554 </div>
1560 "Merge: " and the sha1s of ancestral commits are printed,
1561 separated by spaces. Note that the listed commits may not
1563 have limited your view of history: for example, if you are
1564 only interested in changes related to a certain directory or
1565 file.</p></div>
1568 config option to either another format name, or a
1571 built-in formats:</p></div>
1573 <li>
1574 <p>
1576 </p>
1580 </div></div>
1582 </li>
1583 <li>
1584 <p>
1586 </p>
1591 </div></div>
1595 </div></div>
1596 </li>
1597 <li>
1598 <p>
1600 </p>
1606 </div></div>
1610 </div></div>
1614 </div></div>
1615 </li>
1616 <li>
1617 <p>
1619 </p>
1625 </div></div>
1629 </div></div>
1633 </div></div>
1634 </li>
1635 <li>
1636 <p>
1638 </p>
1646 </div></div>
1650 </div></div>
1654 </div></div>
1655 </li>
1656 <li>
1657 <p>
1659 </p>
1666 </div></div>
1670 </div></div>
1671 </li>
1672 <li>
1673 <p>
1675 </p>
1677 stored in the commit object. Notably, the SHA1s are
1678 displayed in full, regardless of whether --abbrev or
1680 true parent commits, without taking grafts nor history
1681 simplification into account.</p></div>
1682 </li>
1683 <li>
1684 <p>
1686 </p>
1687 <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information
1688 you want to show. It works a little bit like printf format,
1691 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1692 would show something like this:</p></div>
1696 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
1697 </div></div>
1700 <li>
1701 <p>
1703 </p>
1704 </li>
1705 <li>
1706 <p>
1708 </p>
1709 </li>
1710 <li>
1711 <p>
1713 </p>
1714 </li>
1715 <li>
1716 <p>
1718 </p>
1719 </li>
1720 <li>
1721 <p>
1723 </p>
1724 </li>
1725 <li>
1726 <p>
1728 </p>
1729 </li>
1730 <li>
1731 <p>
1733 </p>
1734 </li>
1735 <li>
1736 <p>
1737 <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>)
1738 </p>
1739 </li>
1740 <li>
1741 <p>
1743 </p>
1744 </li>
1745 <li>
1746 <p>
1747 <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>)
1748 </p>
1749 </li>
1750 <li>
1751 <p>
1753 </p>
1754 </li>
1755 <li>
1756 <p>
1758 </p>
1759 </li>
1760 <li>
1761 <p>
1763 </p>
1764 </li>
1765 <li>
1766 <p>
1768 </p>
1769 </li>
1770 <li>
1771 <p>
1773 </p>
1774 </li>
1775 <li>
1776 <p>
1778 </p>
1779 </li>
1780 <li>
1781 <p>
1782 <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>)
1783 </p>
1784 </li>
1785 <li>
1786 <p>
1788 </p>
1789 </li>
1790 <li>
1791 <p>
1792 <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>)
1793 </p>
1794 </li>
1795 <li>
1796 <p>
1798 </p>
1799 </li>
1800 <li>
1801 <p>
1803 </p>
1804 </li>
1805 <li>
1806 <p>
1808 </p>
1809 </li>
1810 <li>
1811 <p>
1813 </p>
1814 </li>
1815 <li>
1816 <p>
1818 </p>
1819 </li>
1820 <li>
1821 <p>
1823 </p>
1824 </li>
1825 <li>
1826 <p>
1828 </p>
1829 </li>
1830 <li>
1831 <p>
1833 </p>
1834 </li>
1835 <li>
1836 <p>
1838 </p>
1839 </li>
1840 <li>
1841 <p>
1843 </p>
1844 </li>
1845 <li>
1846 <p>
1848 </p>
1849 </li>
1850 <li>
1851 <p>
1853 </p>
1854 </li>
1855 <li>
1856 <p>
1858 </p>
1859 </li>
1860 <li>
1861 <p>
1863 </p>
1864 </li>
1865 <li>
1866 <p>
1868 </p>
1869 </li>
1870 <li>
1871 <p>
1873 </p>
1874 </li>
1875 <li>
1876 <p>
1878 </p>
1879 </li>
1880 <li>
1881 <p>
1883 </p>
1884 </li>
1885 <li>
1886 <p>
1888 </p>
1889 </li>
1890 <li>
1891 <p>
1893 </p>
1894 </li>
1895 <li>
1896 <p>
1898 </p>
1899 </li>
1900 <li>
1901 <p>
1903 </p>
1904 </li>
1905 <li>
1906 <p>
1908 </p>
1909 </li>
1910 <li>
1911 <p>
1913 </p>
1914 </li>
1915 <li>
1916 <p>
1917 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
1919 </p>
1920 </li>
1921 </ul></div>
1922 </li>
1923 </ul></div>
1925 <table><tr>
1928 </td>
1931 insert an empty string unless we are traversing reflog entries (e.g., by
1934 </tr></table>
1935 </div>
1936 <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
1937 is inserted immediately before the expansion if and only if the
1938 placeholder expands to a non-empty string.</p></div>
1939 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
1940 immediately precede the expansion are deleted if and only if the
1941 placeholder expands to an empty string.</p></div>
1943 is inserted immediately before the expansion if and only if the
1944 placeholder expands to a non-empty string.</p></div>
1946 <li>
1947 <p>
1949 </p>
1950 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1952 other words, each commit has the message terminator character (usually a
1953 newline) appended, rather than a separator placed between entries.
1954 This means that the final entry of a single-line format will be properly
1955 terminated with a new line, just as the "oneline" format does.
1956 For example:</p></div>
1960 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1961 4da45be
1962 7134973 -- NO NEWLINE
1965 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1966 4da45be
1968 </div></div>
1969 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
1971 equivalent:</p></div>
1976 </div></div>
1977 </li>
1978 </ul></div>
1979 </div>
1984 -p
1985 </dt>
1987 -u
1988 </dt>
1990 --patch
1991 </dt>
1992 <dd>
1993 <p>
1994 Generate patch (see section on generating patches).
1996 </p>
1997 </dd>
2000 </dt>
2003 </dt>
2004 <dd>
2005 <p>
2007 the usual three.
2009 </p>
2010 </dd>
2012 --raw
2013 </dt>
2014 <dd>
2015 <p>
2016 Generate the raw format.
2018 </p>
2019 </dd>
2021 --patch-with-raw
2022 </dt>
2023 <dd>
2024 <p>
2026 </p>
2027 </dd>
2029 --patience
2030 </dt>
2031 <dd>
2032 <p>
2033 Generate a diff using the "patience diff" algorithm.
2034 </p>
2035 </dd>
2038 </dt>
2039 <dd>
2040 <p>
2041 Generate a diffstat. You can override the default
2043 The width of the filename part can be controlled by
2044 giving another width to it separated by a comma.
2045 </p>
2046 </dd>
2048 --numstat
2049 </dt>
2050 <dd>
2051 <p>
2053 deleted lines in decimal notation and pathname without
2054 abbreviation, to make it more machine friendly. For
2057 </p>
2058 </dd>
2060 --shortstat
2061 </dt>
2062 <dd>
2063 <p>
2065 number of modified files, as well as number of added and deleted
2066 lines.
2067 </p>
2068 </dd>
2071 </dt>
2072 <dd>
2073 <p>
2074 Output the distribution of relative amount of changes (number of lines added or
2075 removed) for each sub-directory. Directories with changes below
2076 a cut-off percent (3% by default) are not shown. The cut-off percent
2079 </p>
2080 </dd>
2083 </dt>
2084 <dd>
2085 <p>
2087 </p>
2088 </dd>
2090 --summary
2091 </dt>
2092 <dd>
2093 <p>
2094 Output a condensed summary of extended header information
2095 such as creations, renames and mode changes.
2096 </p>
2097 </dd>
2099 --patch-with-stat
2100 </dt>
2101 <dd>
2102 <p>
2104 </p>
2105 </dd>
2107 -z
2108 </dt>
2109 <dd>
2110 <p>
2111 Separate the commits with NULs instead of with new newlines.
2112 </p>
2113 <div class="paragraph"><p>Also, when <tt>--raw</tt> or <tt>--numstat</tt> has been given, do not munge
2114 pathnames and use NULs as output field terminators.</p></div>
2115 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
2117 respectively, and the pathname will be enclosed in double quotes if
2118 any of those replacements occurred.</p></div>
2119 </dd>
2121 --name-only
2122 </dt>
2123 <dd>
2124 <p>
2125 Show only names of changed files.
2126 </p>
2127 </dd>
2129 --name-status
2130 </dt>
2131 <dd>
2132 <p>
2133 Show only names and status of changed files. See the description
2134 of the <tt>--diff-filter</tt> option on what the status letters mean.
2135 </p>
2136 </dd>
2138 --submodule[=<format>]
2139 </dt>
2140 <dd>
2141 <p>
2142 Chose the output format for submodule differences. <format> can be one of
2143 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
2144 is used when this option is not given. <em>log</em> is the default value for this
2145 option and lists the commits in that commit range like the <em>summary</em>
2147 </p>
2148 </dd>
2150 --color[=<when>]
2151 </dt>
2152 <dd>
2153 <p>
2154 Show colored diff.
2155 The value must be always (the default), never, or auto.
2156 </p>
2157 </dd>
2159 --no-color
2160 </dt>
2161 <dd>
2162 <p>
2163 Turn off colored diff, even when the configuration file
2164 gives the default to color output.
2165 Same as <tt>--color=never</tt>.
2166 </p>
2167 </dd>
2169 --word-diff[=<mode>]
2170 </dt>
2171 <dd>
2172 <p>
2173 Show a word diff, using the <mode> to delimit changed words.
2174 By default, words are delimited by whitespace; see
2175 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
2176 must be one of:
2177 </p>
2180 color
2181 </dt>
2182 <dd>
2183 <p>
2184 Highlight changed words using only colors. Implies <tt>--color</tt>.
2185 </p>
2186 </dd>
2188 plain
2189 </dt>
2190 <dd>
2191 <p>
2192 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
2193 attempts to escape the delimiters if they appear in the input,
2194 so the output may be ambiguous.
2195 </p>
2196 </dd>
2198 porcelain
2199 </dt>
2200 <dd>
2201 <p>
2202 Use a special line-based format intended for script
2203 consumption. Added/removed/unchanged runs are printed in the
2204 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
2205 character at the beginning of the line and extending to the
2206 end of the line. Newlines in the input are represented by a
2207 tilde <tt>~</tt> on a line of its own.
2208 </p>
2209 </dd>
2211 none
2212 </dt>
2213 <dd>
2214 <p>
2215 Disable word diff again.
2216 </p>
2217 </dd>
2218 </dl></div>
2220 highlight the changed parts in all modes if enabled.</p></div>
2221 </dd>
2223 --word-diff-regex=<regex>
2224 </dt>
2225 <dd>
2226 <p>
2227 Use <regex> to decide what a word is, instead of considering
2228 runs of non-whitespace to be a word. Also implies
2229 <tt>--word-diff</tt> unless it was already enabled.
2230 </p>
2232 <regex> is considered a word. Anything between these matches is
2233 considered whitespace and ignored(!) for the purposes of finding
2234 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
2235 expression to make sure that it matches all non-whitespace characters.
2236 A match that contains a newline is silently truncated(!) at the
2237 newline.</p></div>
2238 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
2239 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
2240 overrides any diff driver or configuration setting. Diff drivers
2241 override configuration settings.</p></div>
2242 </dd>
2244 --color-words[=<regex>]
2245 </dt>
2246 <dd>
2247 <p>
2248 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
2249 specified) <tt>--word-diff-regex=<regex></tt>.
2250 </p>
2251 </dd>
2253 --no-renames
2254 </dt>
2255 <dd>
2256 <p>
2257 Turn off rename detection, even when the configuration
2258 file gives the default to do so.
2259 </p>
2260 </dd>
2262 --check
2263 </dt>
2264 <dd>
2265 <p>
2266 Warn if changes introduce trailing whitespace
2267 or an indent that uses a space before a tab. Exits with
2268 non-zero status if problems are found. Not compatible with
2269 --exit-code.
2270 </p>
2271 </dd>
2273 --full-index
2274 </dt>
2275 <dd>
2276 <p>
2277 Instead of the first handful of characters, show the full
2279 line when generating patch format output.
2280 </p>
2281 </dd>
2283 --binary
2284 </dt>
2285 <dd>
2286 <p>
2287 In addition to <tt>--full-index</tt>, output a binary diff that
2288 can be applied with <tt>git-apply</tt>.
2289 </p>
2290 </dd>
2292 --abbrev[=<n>]
2293 </dt>
2294 <dd>
2295 <p>
2296 Instead of showing the full 40-byte hexadecimal object
2297 name in diff-raw format output and diff-tree header
2298 lines, show only a partial prefix. This is
2299 independent of the <tt>--full-index</tt> option above, which controls
2300 the diff-patch output format. Non default number of
2301 digits can be specified with <tt>--abbrev=<n></tt>.
2302 </p>
2303 </dd>
2305 -B[<n>][/<m>]
2306 </dt>
2308 --break-rewrites[=[<n>][/<m>]]
2309 </dt>
2310 <dd>
2311 <p>
2312 Break complete rewrite changes into pairs of delete and
2313 create. This serves two purposes:
2314 </p>
2315 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
2316 not as a series of deletion and insertion mixed together with a very
2317 few lines that happen to match textually as the context, but as a
2318 single deletion of everything old followed by a single insertion of
2319 everything new, and the number <tt>m</tt> controls this aspect of the -B
2320 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
2321 original should remain in the result for git to consider it a total
2322 rewrite (i.e. otherwise the resulting patch will be a series of
2323 deletion and insertion mixed together with context lines).</p></div>
2324 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
2325 source of a rename (usually -M only considers a file that disappeared
2326 as the source of a rename), and the number <tt>n</tt> controls this aspect of
2327 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
2328 addition and deletion compared to 20% or more of the file’s size are
2329 eligible for being picked up as a possible source of a rename to
2330 another file.</p></div>
2331 </dd>
2333 -M[<n>]
2334 </dt>
2336 --find-renames[=<n>]
2337 </dt>
2338 <dd>
2339 <p>
2340 If generating diffs, detect and report renames for each commit.
2341 For following files across renames while traversing history, see
2342 <tt>--follow</tt>.
2343 If <tt>n</tt> is specified, it is a is a threshold on the similarity
2344 index (i.e. amount of addition/deletions compared to the
2345 file’s size). For example, <tt>-M90%</tt> means git should consider a
2346 delete/add pair to be a rename if more than 90% of the file
2347 hasn’t changed.
2348 </p>
2349 </dd>
2351 -C[<n>]
2352 </dt>
2354 --find-copies[=<n>]
2355 </dt>
2356 <dd>
2357 <p>
2358 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
2359 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
2360 </p>
2361 </dd>
2363 --find-copies-harder
2364 </dt>
2365 <dd>
2366 <p>
2367 For performance reasons, by default, <tt>-C</tt> option finds copies only
2368 if the original file of the copy was modified in the same
2369 changeset. This flag makes the command
2370 inspect unmodified files as candidates for the source of
2371 copy. This is a very expensive operation for large
2372 projects, so use it with caution. Giving more than one
2373 <tt>-C</tt> option has the same effect.
2374 </p>
2375 </dd>
2377 -l<num>
2378 </dt>
2379 <dd>
2380 <p>
2381 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
2382 is the number of potential rename/copy targets. This
2383 option prevents rename/copy detection from running if
2384 the number of rename/copy targets exceeds the specified
2385 number.
2386 </p>
2387 </dd>
2389 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
2390 </dt>
2391 <dd>
2392 <p>
2393 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
2394 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
2395 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
2396 are Unmerged (<tt>U</tt>), are
2397 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
2398 Any combination of the filter characters (including none) can be used.
2399 When <tt>*</tt> (All-or-none) is added to the combination, all
2400 paths are selected if there is any file that matches
2401 other criteria in the comparison; if there is no file
2402 that matches other criteria, nothing is selected.
2403 </p>
2404 </dd>
2406 -S<string>
2407 </dt>
2408 <dd>
2409 <p>
2410 Look for differences that introduce or remove an instance of
2411 <string>. Note that this is different than the string simply
2412 appearing in diff output; see the <em>pickaxe</em> entry in
2414 </p>
2415 </dd>
2417 -G<regex>
2418 </dt>
2419 <dd>
2420 <p>
2421 Look for differences whose added or removed line matches
2422 the given <regex>.
2423 </p>
2424 </dd>
2426 --pickaxe-all
2427 </dt>
2428 <dd>
2429 <p>
2430 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
2431 changeset, not just the files that contain the change
2432 in <string>.
2433 </p>
2434 </dd>
2436 --pickaxe-regex
2437 </dt>
2438 <dd>
2439 <p>
2440 Make the <string> not a plain string but an extended POSIX
2441 regex to match.
2442 </p>
2443 </dd>
2445 -O<orderfile>
2446 </dt>
2447 <dd>
2448 <p>
2449 Output the patch in the order specified in the
2450 <orderfile>, which has one shell glob pattern per line.
2451 </p>
2452 </dd>
2454 -R
2455 </dt>
2456 <dd>
2457 <p>
2458 Swap two inputs; that is, show differences from index or
2459 on-disk file to tree contents.
2460 </p>
2461 </dd>
2463 --relative[=<path>]
2464 </dt>
2465 <dd>
2466 <p>
2467 When run from a subdirectory of the project, it can be
2468 told to exclude changes outside the directory and show
2469 pathnames relative to it with this option. When you are
2470 not in a subdirectory (e.g. in a bare repository), you
2471 can name which subdirectory to make the output relative
2472 to by giving a <path> as an argument.
2473 </p>
2474 </dd>
2476 -a
2477 </dt>
2479 --text
2480 </dt>
2481 <dd>
2482 <p>
2483 Treat all files as text.
2484 </p>
2485 </dd>
2487 --ignore-space-at-eol
2488 </dt>
2489 <dd>
2490 <p>
2491 Ignore changes in whitespace at EOL.
2492 </p>
2493 </dd>
2495 -b
2496 </dt>
2498 --ignore-space-change
2499 </dt>
2500 <dd>
2501 <p>
2502 Ignore changes in amount of whitespace. This ignores whitespace
2503 at line end, and considers all other sequences of one or
2504 more whitespace characters to be equivalent.
2505 </p>
2506 </dd>
2508 -w
2509 </dt>
2511 --ignore-all-space
2512 </dt>
2513 <dd>
2514 <p>
2515 Ignore whitespace when comparing lines. This ignores
2516 differences even if one line has whitespace where the other
2517 line has none.
2518 </p>
2519 </dd>
2521 --inter-hunk-context=<lines>
2522 </dt>
2523 <dd>
2524 <p>
2525 Show the context between diff hunks, up to the specified number
2526 of lines, thereby fusing hunks that are close to each other.
2527 </p>
2528 </dd>
2530 --exit-code
2531 </dt>
2532 <dd>
2533 <p>
2534 Make the program exit with codes similar to diff(1).
2535 That is, it exits with 1 if there were differences and
2536 0 means no differences.
2537 </p>
2538 </dd>
2540 --quiet
2541 </dt>
2542 <dd>
2543 <p>
2544 Disable all output of the program. Implies <tt>--exit-code</tt>.
2545 </p>
2546 </dd>
2548 --ext-diff
2549 </dt>
2550 <dd>
2551 <p>
2552 Allow an external diff helper to be executed. If you set an
2555 </p>
2556 </dd>
2558 --no-ext-diff
2559 </dt>
2560 <dd>
2561 <p>
2562 Disallow external diff drivers.
2563 </p>
2564 </dd>
2566 --ignore-submodules[=<when>]
2567 </dt>
2568 <dd>
2569 <p>
2570 Ignore changes to submodules in the diff generation. <when> can be
2573 untracked or modified files or its HEAD differs from the commit recorded
2574 in the superproject and can be used to override any settings of the
2575 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2577 contain untracked content (but they are still scanned for modified
2579 only changes to the commits stored in the superproject are shown (this was
2581 </p>
2582 </dd>
2584 --src-prefix=<prefix>
2585 </dt>
2586 <dd>
2587 <p>
2589 </p>
2590 </dd>
2592 --dst-prefix=<prefix>
2593 </dt>
2594 <dd>
2595 <p>
2597 </p>
2598 </dd>
2600 --no-prefix
2601 </dt>
2602 <dd>
2603 <p>
2604 Do not show any source or destination prefix.
2605 </p>
2606 </dd>
2607 </dl></div>
2610 </div>
2616 do not produce the output described above; instead they produce a
2617 patch file. You can customize the creation of such patches via the
2618 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
2619 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2620 diff format:</p></div>
2622 <li>
2623 <p>
2625 </p>
2628 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2629 </div></div>
2630 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2631 involved. Especially, even for a creation or a deletion,
2632 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2633 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
2634 name of the source file of the rename/copy and the name of
2635 the file that rename/copy produces, respectively.</p></div>
2636 </li>
2637 <li>
2638 <p>
2639 It is followed by one or more extended header lines:
2640 </p>
2643 <pre><tt>old mode <mode>
2644 new mode <mode>
2645 deleted file mode <mode>
2646 new file mode <mode>
2647 copy from <path>
2648 copy to <path>
2649 rename from <path>
2650 rename to <path>
2651 similarity index <number>
2652 dissimilarity index <number>
2653 index <hash>..<hash> <mode></tt></pre>
2654 </div></div>
2655 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2656 and file permission bits.</p></div>
2657 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
2659 the dissimilarity index is the percentage of changed lines. It
2660 is a rounded down integer, followed by a percent sign. The
2661 similarity index value of 100% is thus reserved for two equal
2662 files, while 100% dissimilarity means that no line from the old
2663 file made it into the new one.</p></div>
2664 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
2665 The <mode> is included if the file mode does not change; otherwise,
2666 separate lines indicate the old and the new mode.</p></div>
2667 </li>
2668 <li>
2669 <p>
2670 TAB, LF, double quote and backslash characters in pathnames
2672 If there is need for such substitution then the whole
2673 pathname is put in double quotes.
2674 </p>
2675 </li>
2676 <li>
2677 <p>
2680 It is incorrect to apply each change to each file sequentially. For
2681 example, this patch will swap a and b:
2682 </p>
2685 <pre><tt>diff --git a/a b/b
2686 rename from a
2687 rename to b
2688 diff --git a/b b/a
2689 rename from b
2690 rename to a</tt></pre>
2691 </div></div>
2692 </li>
2693 </ol></div>
2694 </div>
2697 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
2700 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
2701 of these commands to force generation of diffs with individual parents
2702 of a merge.</p></div>
2706 <pre><tt>diff --combined describe.c
2707 index fabadb8,cc95eb0..4866510
2708 --- a/describe.c
2709 +++ b/describe.c
2712 }
2714 - static void describe(char *arg)
2715 -static void describe(struct commit *cmit, int last_one)
2716 ++static void describe(char *arg, int last_one)
2717 {
2718 + unsigned char sha1[20];
2719 + struct commit *cmit;
2720 struct commit_list *list;
2721 static int initialized = 0;
2722 struct commit_name *n;
2725 + usage(describe_usage);
2726 + cmit = lookup_commit_reference(sha1);
2727 + if (!cmit)
2728 + usage(describe_usage);
2729 +
2730 if (!initialized) {
2731 initialized = 1;
2732 for_each_ref(get_name);</tt></pre>
2733 </div></div>
2735 <li>
2736 <p>
2737 It is preceded with a "git diff" header, that looks like
2739 </p>
2743 </div></div>
2748 </div></div>
2749 </li>
2750 <li>
2751 <p>
2752 It is followed by one or more extended header lines
2753 (this example shows a merge with two parents):
2754 </p>
2761 </div></div>
2762 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
2764 information about detected contents movement (renames and
2765 copying detection) are designed to work with diff of two
2767 </li>
2768 <li>
2769 <p>
2770 It is followed by two-line from-file/to-file header
2771 </p>
2774 <pre><tt>--- a/file
2775 +++ b/file</tt></pre>
2776 </div></div>
2779 files.</p></div>
2780 </li>
2781 <li>
2782 <p>
2783 Chunk header format is modified to prevent people from
2785 was created for review of merge commit changes, and was not
2786 meant for apply. The change is similar to the change in the
2788 </p>
2791 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
2792 </div></div>
2794 header for combined diff format.</p></div>
2795 </li>
2796 </ol></div>
2798 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
2800 compares two or more files file1, file2,… with one file X, and
2801 shows how X differs from each of fileN. One column for each of
2802 fileN is prepended to the output line to note how X’s line is
2803 different from it.</p></div>
2804 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
2806 in the column N means that the line appears in the result,
2807 and fileN does not have that line (in other words, the line was
2808 added, from the point of view of that parent).</p></div>
2812 in either file1 nor file2). Also eight other lines are the same
2814 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
2815 merge commit with the merge result (i.e. file1..fileN are the
2817 two unresolved merge parents with the working tree file
2820 </div>
2825 git log --no-merges
2826 </dt>
2827 <dd>
2828 <p>
2829 Show the whole commit history, but skip any merges
2830 </p>
2831 </dd>
2833 git log v2.6.12.. include/scsi drivers/scsi
2834 </dt>
2835 <dd>
2836 <p>
2838 in the include/scsi or drivers/scsi subdirectories
2839 </p>
2840 </dd>
2843 </dt>
2844 <dd>
2845 <p>
2849 </p>
2850 </dd>
2852 git log --name-status release..test
2853 </dt>
2854 <dd>
2855 <p>
2856 Show the commits that are in the "test" branch but not yet
2857 in the "release" branch, along with the list of paths
2858 each commit modifies.
2859 </p>
2860 </dd>
2862 git log --follow builtin-rev-list.c
2863 </dt>
2864 <dd>
2865 <p>
2866 Shows the commits that changed builtin-rev-list.c, including
2867 those commits that occurred before the file was given its
2868 present name.
2869 </p>
2870 </dd>
2872 git log --branches --not --remotes=origin
2873 </dt>
2874 <dd>
2875 <p>
2876 Shows all commits that are in any of local branches but not in
2878 origin doesn’t).
2879 </p>
2880 </dd>
2882 git log master --not --remotes=*/master
2883 </dt>
2884 <dd>
2885 <p>
2886 Shows all commits that are in local master but not in any remote
2887 repository master branches.
2888 </p>
2889 </dd>
2891 git log -p -m --first-parent
2892 </dt>
2893 <dd>
2894 <p>
2895 Shows the history including change diffs, but only from the
2896 "main branch" perspective, skipping commits that come from merged
2897 branches, and showing full diffs of changes introduced by the merges.
2898 This makes sense only when following a strict policy of merging all
2899 topic branches when staying on a single integration branch.
2900 </p>
2901 </dd>
2902 </dl></div>
2903 </div>
2908 <li>
2909 <p>
2910 The pathnames recorded in the index and in the tree objects
2911 are treated as uninterpreted sequences of non-NUL bytes.
2912 What readdir(2) returns are what are recorded and compared
2913 with the data git keeps track of, which in turn are expected
2915 thing as pathname encoding translation.
2916 </p>
2917 </li>
2918 <li>
2919 <p>
2920 The contents of the blob objects are uninterpreted sequences
2921 of bytes. There is no encoding translation at the core
2922 level.
2923 </p>
2924 </li>
2925 <li>
2926 <p>
2927 The commit log messages are uninterpreted sequences of non-NUL
2928 bytes.
2929 </p>
2930 </li>
2931 </ul></div>
2933 in UTF-8, both the core and git Porcelain are designed not to
2934 force UTF-8 on projects. If all participants of a particular
2935 project find it more convenient to use legacy encodings, git
2936 does not forbid it. However, there are a few things to keep in
2937 mind.</p></div>
2939 <li>
2940 <p>
2942 a warning if the commit log message given to it does not look
2943 like a valid UTF-8 string, unless you explicitly say your
2944 project uses a legacy encoding. The way to say this is to
2946 </p>
2949 <pre><tt>[i18n]
2951 </div></div>
2954 help other people who look at them later. Lack of this header
2956 </li>
2957 <li>
2958 <p>
2961 log message into UTF-8 unless otherwise specified. You can
2962 specify the desired output encoding with
2964 </p>
2967 <pre><tt>[i18n]
2969 </div></div>
2972 </li>
2973 </ol></div>
2975 message when a commit is made to force UTF-8 at the commit
2976 object level, because re-coding to UTF-8 is not necessarily a
2977 reversible operation.</p></div>
2978 </div>
2981 <div class="paragraph"><p>See <a href="git-config.html">git-config(1)</a> for core variables and <a href="git-diff.html">git-diff(1)</a>
2982 for settings related to diff generation.</p></div>
2985 format.pretty
2986 </dt>
2987 <dd>
2988 <p>
2990 Defaults to "medium".
2991 </p>
2992 </dd>
2994 i18n.logOutputEncoding
2995 </dt>
2996 <dd>
2997 <p>
2998 Encoding to use when displaying logs. (See "Discussion", above.)
3000 otherwise.
3001 </p>
3002 </dd>
3004 log.date
3005 </dt>
3006 <dd>
3007 <p>
3008 Default format for human-readable dates. (Compare the
3011 </p>
3012 </dd>
3014 log.showroot
3015 </dt>
3016 <dd>
3017 <p>
3019 initial commit as a big creation event. Any root commits in
3022 </p>
3023 </dd>
3025 mailmap.file
3026 </dt>
3027 <dd>
3028 <p>
3030 </p>
3031 </dd>
3033 notes.displayRef
3034 </dt>
3035 <dd>
3036 <p>
3041 </p>
3043 multiple times. A warning will be issued for refs that do not exist,
3044 but a glob that does not match any refs is silently ignored.</p></div>
3045 <div class="paragraph"><p>This setting can be disabled by the <tt>--no-standard-notes</tt> option,
3048 </dd>
3049 </dl></div>
3050 </div>
3054 </div>
3058 </div>
3059 </div>
3060 </body>
3061 </html>