| blob | 6a7fa890c65905ee669928db980357c1be9b031e |
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 --ignore-missing
760 </dt>
761 <dd>
762 <p>
763 Upon seeing an invalid object name in the input, pretend as if
764 the bad input was not given.
765 </p>
766 </dd>
768 --bisect
769 </dt>
770 <dd>
771 <p>
775 line.
776 </p>
777 </dd>
779 --stdin
780 </dt>
781 <dd>
782 <p>
785 seen, stop reading commits and start reading paths to limit the
786 result.
787 </p>
788 </dd>
790 --cherry-mark
791 </dt>
792 <dd>
793 <p>
796 </p>
797 </dd>
799 --cherry-pick
800 </dt>
801 <dd>
802 <p>
803 Omit any commit that introduces the same change as
804 another commit on the "other side" when the set of
805 commits are limited with symmetric difference.
806 </p>
807 <div class="paragraph"><p>For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way
808 to list all commits on only one side of them is with
811 from the other branch (for example, "3rd on b" may be cherry-picked
812 from branch A). With this option, such pairs of commits are
813 excluded from the output.</p></div>
814 </dd>
816 --left-only
817 </dt>
819 --right-only
820 </dt>
821 <dd>
822 <p>
823 List only commits on the respective side of a symmetric range,
826 </p>
827 <div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A…B</tt> omits those
831 list.</p></div>
832 </dd>
834 --cherry
835 </dt>
836 <dd>
837 <p>
839 limit the output to the commits on our side and mark those that
840 have been applied to the other side of a forked history with
843 </p>
844 </dd>
846 -g
847 </dt>
849 --walk-reflogs
850 </dt>
851 <dd>
852 <p>
853 Instead of walking the commit ancestry chain, walk
854 reflog entries from the most recent one to older ones.
855 When this option is used you cannot specify commits to
858 </p>
859 <div class="paragraph"><p>With <em>--pretty</em> format other than oneline (for obvious reasons),
860 this causes the output to have two extra lines of information
862 used in the output. When the starting commit is specified as
865 prefixed with this information on the same line.
868 </dd>
870 --merge
871 </dt>
872 <dd>
873 <p>
874 After a failed merge, show refs that touch files having a
875 conflict and don’t exist on all heads to merge.
876 </p>
877 </dd>
879 --boundary
880 </dt>
881 <dd>
882 <p>
883 Output uninteresting commits at the boundary, which are usually
884 not shown.
885 </p>
886 </dd>
887 </dl></div>
889 <div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the
892 is how to do it, as there are various strategies to simplify the history.</p></div>
897 </dt>
898 <dd>
899 <p>
901 </p>
902 </dd>
904 --simplify-by-decoration
905 </dt>
906 <dd>
907 <p>
908 Commits that are referred by some branch or tag are selected.
909 </p>
910 </dd>
911 </dl></div>
912 <div class="paragraph"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
913 <div class="paragraph"><p>The following options affect the way the simplification is performed:</p></div>
916 Default mode
917 </dt>
918 <dd>
919 <p>
920 Simplifies the history to the simplest history explaining the
921 final state of the tree. Simplest because it prunes some side
922 branches if the end result is the same (i.e. merging branches
923 with the same content)
924 </p>
925 </dd>
927 --full-history
928 </dt>
929 <dd>
930 <p>
931 As the default mode but does not prune some history.
932 </p>
933 </dd>
935 --dense
936 </dt>
937 <dd>
938 <p>
939 Only the selected commits are shown, plus some to have a
940 meaningful history.
941 </p>
942 </dd>
944 --sparse
945 </dt>
946 <dd>
947 <p>
948 All commits in the simplified history are shown.
949 </p>
950 </dd>
952 --simplify-merges
953 </dt>
954 <dd>
955 <p>
957 merges from the resulting history, as there are no selected
958 commits contributing to this merge.
959 </p>
960 </dd>
962 --ancestry-path
963 </dt>
964 <dd>
965 <p>
971 </p>
972 </dd>
973 </dl></div>
975 <div class="paragraph"><p>Suppose you specified <tt>foo</tt> as the <paths>. We shall call commits
979 illustrate the differences between simplification settings. We assume
983 <pre><tt> .-A---M---N---O---P
984 / / / / /
985 I B C D E
986 \ / / / /
987 `-------------'</tt></pre>
988 </div></div>
989 <div class="paragraph"><p>The horizontal line of history A—P is taken to be the first parent of
990 each merge. The commits are:</p></div>
992 <li>
993 <p>
997 </p>
998 </li>
999 <li>
1000 <p>
1002 </p>
1003 </li>
1004 <li>
1005 <p>
1007 hence TREESAME to all parents.
1008 </p>
1009 </li>
1010 <li>
1011 <p>
1013 so it is not TREESAME to any parent.
1014 </p>
1015 </li>
1016 <li>
1017 <p>
1020 </p>
1021 </li>
1022 <li>
1023 <p>
1026 TREESAME to all parents.
1027 </p>
1028 </li>
1029 </ul></div>
1030 <div class="paragraph"><p><em>rev-list</em> walks backwards through history, including or excluding
1033 are available.</p></div>
1036 Default mode
1037 </dt>
1038 <dd>
1039 <p>
1040 Commits are included if they are not TREESAME to any parent
1042 commit was a merge, and it was TREESAME to one parent, follow
1043 only that parent. (Even if there are several TREESAME
1044 parents, follow only one of them.) Otherwise, follow all
1045 parents.
1046 </p>
1050 <pre><tt> .-A---N---O
1051 / / /
1052 I---------D</tt></pre>
1053 </div></div>
1058 <div class="paragraph"><p>Parent/child relations are only visible with --parents, but that does
1059 not affect the commits selected in default mode, so we have shown the
1060 parent lines.</p></div>
1061 </dd>
1063 --full-history without parent rewriting
1064 </dt>
1065 <dd>
1066 <p>
1067 This mode differs from the default in one point: always follow
1068 all parents of a merge, even if it is TREESAME to one of them.
1069 Even if more than one side of the merge has commits that are
1070 included, this does not imply that the merge itself is! In
1071 the example, we get
1072 </p>
1076 </div></div>
1077 <div class="paragraph"><p><tt>P</tt> and <tt>M</tt> were excluded because they are TREESAME to a parent. <tt>E</tt>,
1079 do not appear.</p></div>
1080 <div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk
1081 about the parent/child relationships between the commits, so we show
1082 them disconnected.</p></div>
1083 </dd>
1085 --full-history with parent rewriting
1086 </dt>
1087 <dd>
1088 <p>
1089 Ordinary commits are only included if they are !TREESAME
1091 </p>
1093 Along each parent, prune away commits that are not included
1094 themselves. This results in</p></div>
1097 <pre><tt> .-A---M---N---O---P
1098 / / / / /
1099 I B / D /
1100 \ / / / /
1101 `-------------'</tt></pre>
1102 </div></div>
1103 <div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt>
1104 was pruned away because it is TREESAME, but the parent list of P was
1107 </dd>
1108 </dl></div>
1110 affects inclusion:</p></div>
1113 --dense
1114 </dt>
1115 <dd>
1116 <p>
1117 Commits that are walked are included if they are not TREESAME
1118 to any parent.
1119 </p>
1120 </dd>
1122 --sparse
1123 </dt>
1124 <dd>
1125 <p>
1126 All commits that are walked are included.
1127 </p>
1128 <div class="paragraph"><p>Note that without <em>--full-history</em>, this still simplifies merges: if
1129 one of the parents is TREESAME, we follow only that one, so the other
1130 sides of the merge are never walked.</p></div>
1131 </dd>
1133 --simplify-merges
1134 </dt>
1135 <dd>
1136 <p>
1137 First, build a history graph in the same way that
1139 </p>
1140 <div class="paragraph"><p>Then simplify each commit ‘C` to its replacement <tt>C’</tt> in the final
1141 history according to the following rules:</p></div>
1143 <li>
1144 <p>
1146 </p>
1147 </li>
1148 <li>
1149 <p>
1150 Replace each parent ‘P` of <tt>C’</tt> with its simplification ‘P’`. In
1151 the process, drop parents that are ancestors of other parents, and
1152 remove duplicates.
1153 </p>
1154 </li>
1155 <li>
1156 <p>
1159 Otherwise, it is replaced with its only parent.
1160 </p>
1161 </li>
1162 </ul></div>
1167 <pre><tt> .-A---M---N---O
1168 / / /
1169 I B D
1170 \ / /
1171 `---------'</tt></pre>
1172 </div></div>
1173 <div class="paragraph"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div>
1175 <li>
1176 <p>
1179 </p>
1180 </li>
1181 <li>
1182 <p>
1184 removed completely, because it had one parent and is TREESAME.
1185 </p>
1186 </li>
1187 </ul></div>
1188 </dd>
1189 </dl></div>
1193 --ancestry-path
1194 </dt>
1195 <dd>
1196 <p>
1197 Limit the displayed commits to those directly on the ancestry
1199 range. I.e. only display commits that are ancestor of the "to"
1200 commit, and descendants of the "from" commit.
1201 </p>
1202 <div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
1205 <pre><tt> D---E-------F
1206 / \ \
1207 B---C---G---H---I---J
1208 / \
1209 A-------K---------------L--M</tt></pre>
1210 </div></div>
1211 <div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <tt>M</tt>,
1214 that "what does <tt>M</tt> have that did not exist in <tt>D</tt>". The result in this
1216 of course).</p></div>
1217 <div class="paragraph"><p>When we want to find out what commits in <tt>M</tt> are contaminated with the
1224 <pre><tt> E-------F
1225 \ \
1226 G---H---I---J
1227 \
1228 L--M</tt></pre>
1229 </div></div>
1230 </dd>
1231 </dl></div>
1232 <div class="paragraph"><p>The <em>--simplify-by-decoration</em> option allows you to view only the
1233 big picture of the topology of the history, by omitting commits
1234 that are not referenced by tags. Commits are marked as !TREESAME
1235 (in other words, kept after history simplification rules described
1237 contents of the paths given on the command line. All other
1238 commits are marked as TREESAME (subject to be simplified away).</p></div>
1240 <div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>
1243 --topo-order
1244 </dt>
1245 <dd>
1246 <p>
1247 This option makes them appear in topological order (i.e.
1248 descendant commits are shown before their parents).
1249 </p>
1250 </dd>
1252 --date-order
1253 </dt>
1254 <dd>
1255 <p>
1257 parent comes before all of its children, but otherwise things
1258 are still ordered in the commit timestamp order.
1259 </p>
1260 </dd>
1262 --reverse
1263 </dt>
1264 <dd>
1265 <p>
1266 Output the commits in reverse order.
1268 </p>
1269 </dd>
1270 </dl></div>
1272 <div class="paragraph"><p>These options are mostly targeted for packing of git repositories.</p></div>
1275 --objects
1276 </dt>
1277 <dd>
1278 <p>
1279 Print the object IDs of any object referenced by the listed
1281 all object IDs which I need to download if I have the commit
1282 object <em>bar</em>, but not <em>foo</em>".
1283 </p>
1284 </dd>
1286 --objects-edge
1287 </dt>
1288 <dd>
1289 <p>
1291 commits prefixed with a "-" character. This is used by
1293 objects in deltified form based on objects contained in these
1294 excluded commits to reduce network traffic.
1295 </p>
1296 </dd>
1298 --unpacked
1299 </dt>
1300 <dd>
1301 <p>
1303 in packs.
1304 </p>
1305 </dd>
1307 --no-walk
1308 </dt>
1309 <dd>
1310 <p>
1311 Only show the given revs, but do not traverse their ancestors.
1312 </p>
1313 </dd>
1315 --do-walk
1316 </dt>
1317 <dd>
1318 <p>
1319 Overrides a previous --no-walk.
1320 </p>
1321 </dd>
1322 </dl></div>
1327 </dt>
1330 </dt>
1331 <dd>
1332 <p>
1333 Pretty-print the contents of the commit logs in a given format,
1335 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See
1336 the "PRETTY FORMATS" section for some additional details for each
1338 </p>
1341 </dd>
1343 --abbrev-commit
1344 </dt>
1345 <dd>
1346 <p>
1347 Instead of showing the full 40-byte hexadecimal commit object
1348 name, show only a partial prefix. Non default number of
1349 digits can be specified with "--abbrev=<n>" (which also modifies
1350 diff output, if it is displayed).
1351 </p>
1354 </dd>
1356 --no-abbrev-commit
1357 </dt>
1358 <dd>
1359 <p>
1360 Show the full 40-byte hexadecimal commit object name. This negates
1363 </p>
1364 </dd>
1366 --oneline
1367 </dt>
1368 <dd>
1369 <p>
1370 This is a shorthand for "--pretty=oneline --abbrev-commit"
1371 used together.
1372 </p>
1373 </dd>
1376 </dt>
1377 <dd>
1378 <p>
1379 The commit objects record the encoding used for the log message
1380 in their encoding header; this option can be used to tell the
1381 command to re-code the commit log message in the encoding
1382 preferred by the user. For non plumbing commands this
1383 defaults to UTF-8.
1384 </p>
1385 </dd>
1388 </dt>
1389 <dd>
1390 <p>
1392 commit, when showing the commit log message. This is the default
1395 on the command line.
1396 </p>
1399 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
1400 <div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the
1402 is not qualified.</p></div>
1404 being displayed. Examples: "--notes=foo" will show only notes from
1407 </dd>
1409 --no-notes
1410 </dt>
1411 <dd>
1412 <p>
1414 resetting the list of notes refs from which notes are shown.
1415 Options are parsed in the order given on the command line, so e.g.
1416 "--notes --notes=foo --no-notes --notes=bar" will only show notes
1417 from "refs/notes/bar".
1418 </p>
1419 </dd>
1422 </dt>
1424 --[no-]standard-notes
1425 </dt>
1426 <dd>
1427 <p>
1428 These options are deprecated. Use the above --notes/--no-notes
1429 options instead.
1430 </p>
1431 </dd>
1433 --relative-date
1434 </dt>
1435 <dd>
1436 <p>
1438 </p>
1439 </dd>
1441 --date=(relative|local|default|iso|rfc|short|raw)
1442 </dt>
1443 <dd>
1444 <p>
1445 Only takes effect for dates shown in human-readable format, such
1447 value for log command’s --date option.
1448 </p>
1451 <div class="paragraph"><p><tt>--date=local</tt> shows timestamps in user’s local timezone.</p></div>
1452 <div class="paragraph"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div>
1453 <div class="paragraph"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822
1454 format, often found in E-mail messages.</p></div>
1455 <div class="paragraph"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div>
1456 <div class="paragraph"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div>
1459 </dd>
1461 --parents
1462 </dt>
1463 <dd>
1464 <p>
1465 Print also the parents of the commit (in the form "commit parent…").
1467 </p>
1468 </dd>
1470 --children
1471 </dt>
1472 <dd>
1473 <p>
1474 Print also the children of the commit (in the form "commit child…").
1476 </p>
1477 </dd>
1479 --left-right
1480 </dt>
1481 <dd>
1482 <p>
1483 Mark which side of a symmetric diff a commit is reachable from.
1487 </p>
1491 <pre><tt> y---b---b branch B
1492 / \ /
1493 / .
1494 / / \
1495 o---x---a---a branch A</tt></pre>
1496 </div></div>
1500 <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B
1506 -yyyyyyy... 1st on b
1508 </div></div>
1509 </dd>
1511 --graph
1512 </dt>
1513 <dd>
1514 <p>
1515 Draw a text-based graphical representation of the commit history
1516 on the left hand side of the output. This may cause extra lines
1517 to be printed in between commits, in order for the graph history
1518 to be drawn properly.
1519 </p>
1520 <div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>
1523 </dd>
1524 </dl></div>
1527 Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
1528 options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
1531 -c
1532 </dt>
1533 <dd>
1534 <p>
1535 With this option, diff output for a merge commit
1536 shows the differences from each of the parents to the merge result
1537 simultaneously instead of showing pairwise diff between a parent
1538 and the result one at a time. Furthermore, it lists only files
1539 which were modified from all parents.
1540 </p>
1541 </dd>
1543 --cc
1544 </dt>
1545 <dd>
1546 <p>
1548 patch output by omitting uninteresting hunks whose contents in
1549 the parents have only two variants and the merge result picks
1550 one of them without modification.
1551 </p>
1552 </dd>
1554 -m
1555 </dt>
1556 <dd>
1557 <p>
1558 This flag makes the merge commits show the full diff like
1559 regular commits; for each merge parent, a separate log entry
1560 and diff is generated. An exception is that only diff against
1562 in that case, the output represents the changes the merge
1564 </p>
1565 </dd>
1567 -r
1568 </dt>
1569 <dd>
1570 <p>
1571 Show recursive diffs.
1572 </p>
1573 </dd>
1575 -t
1576 </dt>
1577 <dd>
1578 <p>
1580 </p>
1581 </dd>
1583 -s
1584 </dt>
1585 <dd>
1586 <p>
1587 Suppress diff output.
1588 </p>
1589 </dd>
1590 </dl></div>
1591 </div>
1597 "Merge: " and the sha1s of ancestral commits are printed,
1598 separated by spaces. Note that the listed commits may not
1600 have limited your view of history: for example, if you are
1601 only interested in changes related to a certain directory or
1602 file.</p></div>
1605 config option to either another format name, or a
1608 built-in formats:</p></div>
1610 <li>
1611 <p>
1613 </p>
1617 </div></div>
1619 </li>
1620 <li>
1621 <p>
1623 </p>
1628 </div></div>
1632 </div></div>
1633 </li>
1634 <li>
1635 <p>
1637 </p>
1643 </div></div>
1647 </div></div>
1651 </div></div>
1652 </li>
1653 <li>
1654 <p>
1656 </p>
1662 </div></div>
1666 </div></div>
1670 </div></div>
1671 </li>
1672 <li>
1673 <p>
1675 </p>
1683 </div></div>
1687 </div></div>
1691 </div></div>
1692 </li>
1693 <li>
1694 <p>
1696 </p>
1703 </div></div>
1707 </div></div>
1708 </li>
1709 <li>
1710 <p>
1712 </p>
1714 stored in the commit object. Notably, the SHA1s are
1715 displayed in full, regardless of whether --abbrev or
1717 true parent commits, without taking grafts nor history
1718 simplification into account.</p></div>
1719 </li>
1720 <li>
1721 <p>
1723 </p>
1724 <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information
1725 you want to show. It works a little bit like printf format,
1728 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1729 would show something like this:</p></div>
1733 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
1734 </div></div>
1737 <li>
1738 <p>
1740 </p>
1741 </li>
1742 <li>
1743 <p>
1745 </p>
1746 </li>
1747 <li>
1748 <p>
1750 </p>
1751 </li>
1752 <li>
1753 <p>
1755 </p>
1756 </li>
1757 <li>
1758 <p>
1760 </p>
1761 </li>
1762 <li>
1763 <p>
1765 </p>
1766 </li>
1767 <li>
1768 <p>
1770 </p>
1771 </li>
1772 <li>
1773 <p>
1774 <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>)
1775 </p>
1776 </li>
1777 <li>
1778 <p>
1780 </p>
1781 </li>
1782 <li>
1783 <p>
1784 <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>)
1785 </p>
1786 </li>
1787 <li>
1788 <p>
1790 </p>
1791 </li>
1792 <li>
1793 <p>
1795 </p>
1796 </li>
1797 <li>
1798 <p>
1800 </p>
1801 </li>
1802 <li>
1803 <p>
1805 </p>
1806 </li>
1807 <li>
1808 <p>
1810 </p>
1811 </li>
1812 <li>
1813 <p>
1815 </p>
1816 </li>
1817 <li>
1818 <p>
1819 <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>)
1820 </p>
1821 </li>
1822 <li>
1823 <p>
1825 </p>
1826 </li>
1827 <li>
1828 <p>
1829 <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>)
1830 </p>
1831 </li>
1832 <li>
1833 <p>
1835 </p>
1836 </li>
1837 <li>
1838 <p>
1840 </p>
1841 </li>
1842 <li>
1843 <p>
1845 </p>
1846 </li>
1847 <li>
1848 <p>
1850 </p>
1851 </li>
1852 <li>
1853 <p>
1855 </p>
1856 </li>
1857 <li>
1858 <p>
1860 </p>
1861 </li>
1862 <li>
1863 <p>
1865 </p>
1866 </li>
1867 <li>
1868 <p>
1870 </p>
1871 </li>
1872 <li>
1873 <p>
1875 </p>
1876 </li>
1877 <li>
1878 <p>
1880 </p>
1881 </li>
1882 <li>
1883 <p>
1885 </p>
1886 </li>
1887 <li>
1888 <p>
1890 </p>
1891 </li>
1892 <li>
1893 <p>
1895 </p>
1896 </li>
1897 <li>
1898 <p>
1900 </p>
1901 </li>
1902 <li>
1903 <p>
1905 </p>
1906 </li>
1907 <li>
1908 <p>
1910 </p>
1911 </li>
1912 <li>
1913 <p>
1915 </p>
1916 </li>
1917 <li>
1918 <p>
1920 </p>
1921 </li>
1922 <li>
1923 <p>
1925 </p>
1926 </li>
1927 <li>
1928 <p>
1930 </p>
1931 </li>
1932 <li>
1933 <p>
1935 </p>
1936 </li>
1937 <li>
1938 <p>
1940 </p>
1941 </li>
1942 <li>
1943 <p>
1945 </p>
1946 </li>
1947 <li>
1948 <p>
1950 </p>
1951 </li>
1952 <li>
1953 <p>
1954 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
1956 </p>
1957 </li>
1958 </ul></div>
1959 </li>
1960 </ul></div>
1962 <table><tr>
1965 </td>
1968 insert an empty string unless we are traversing reflog entries (e.g., by
1971 </tr></table>
1972 </div>
1973 <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
1974 is inserted immediately before the expansion if and only if the
1975 placeholder expands to a non-empty string.</p></div>
1976 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
1977 immediately precede the expansion are deleted if and only if the
1978 placeholder expands to an empty string.</p></div>
1980 is inserted immediately before the expansion if and only if the
1981 placeholder expands to a non-empty string.</p></div>
1983 <li>
1984 <p>
1986 </p>
1987 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1989 other words, each commit has the message terminator character (usually a
1990 newline) appended, rather than a separator placed between entries.
1991 This means that the final entry of a single-line format will be properly
1992 terminated with a new line, just as the "oneline" format does.
1993 For example:</p></div>
1997 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
1998 4da45be
1999 7134973 -- NO NEWLINE
2002 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
2003 4da45be
2005 </div></div>
2006 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
2008 equivalent:</p></div>
2013 </div></div>
2014 </li>
2015 </ul></div>
2016 </div>
2021 -p
2022 </dt>
2024 -u
2025 </dt>
2027 --patch
2028 </dt>
2029 <dd>
2030 <p>
2031 Generate patch (see section on generating patches).
2033 </p>
2034 </dd>
2037 </dt>
2040 </dt>
2041 <dd>
2042 <p>
2044 the usual three.
2046 </p>
2047 </dd>
2049 --raw
2050 </dt>
2051 <dd>
2052 <p>
2053 Generate the raw format.
2055 </p>
2056 </dd>
2058 --patch-with-raw
2059 </dt>
2060 <dd>
2061 <p>
2063 </p>
2064 </dd>
2066 --patience
2067 </dt>
2068 <dd>
2069 <p>
2070 Generate a diff using the "patience diff" algorithm.
2071 </p>
2072 </dd>
2075 </dt>
2076 <dd>
2077 <p>
2078 Generate a diffstat. You can override the default
2080 The width of the filename part can be controlled by
2081 giving another width to it separated by a comma.
2082 </p>
2083 </dd>
2085 --numstat
2086 </dt>
2087 <dd>
2088 <p>
2090 deleted lines in decimal notation and pathname without
2091 abbreviation, to make it more machine friendly. For
2094 </p>
2095 </dd>
2097 --shortstat
2098 </dt>
2099 <dd>
2100 <p>
2102 number of modified files, as well as number of added and deleted
2103 lines.
2104 </p>
2105 </dd>
2108 </dt>
2109 <dd>
2110 <p>
2111 Output the distribution of relative amount of changes for each
2113 passing it a comma separated list of parameters.
2116 The following parameters are available:
2117 </p>
2121 </dt>
2122 <dd>
2123 <p>
2124 Compute the dirstat numbers by counting the lines that have been
2125 removed from the source, or added to the destination. This ignores
2126 the amount of pure code movements within a file. In other words,
2127 rearranging lines in a file is not counted as much as other changes.
2128 This is the default behavior when no parameter is given.
2129 </p>
2130 </dd>
2133 </dt>
2134 <dd>
2135 <p>
2136 Compute the dirstat numbers by doing the regular line-based diff
2137 analysis, and summing the removed/added line counts. (For binary
2138 files, count 64-byte chunks instead, since binary files have no
2141 lines within a file as much as other changes. The resulting output
2143 </p>
2144 </dd>
2147 </dt>
2148 <dd>
2149 <p>
2150 Compute the dirstat numbers by counting the number of files changed.
2151 Each changed file counts equally in the dirstat analysis. This is
2153 not have to look at the file contents at all.
2154 </p>
2155 </dd>
2158 </dt>
2159 <dd>
2160 <p>
2161 Count changes in a child directory for the parent directory as well.
2163 reported may exceed 100%. The default (non-cumulative) behavior can
2165 </p>
2166 </dd>
2169 </dt>
2170 <dd>
2171 <p>
2172 An integer parameter specifies a cut-off percent (3% by default).
2173 Directories contributing less than this percentage of the changes
2174 are not shown in the output.
2175 </p>
2176 </dd>
2177 </dl></div>
2179 directories with less than 10% of the total amount of changed files,
2180 and accumulating child directory counts in the parent directories:
2182 </dd>
2184 --summary
2185 </dt>
2186 <dd>
2187 <p>
2188 Output a condensed summary of extended header information
2189 such as creations, renames and mode changes.
2190 </p>
2191 </dd>
2193 --patch-with-stat
2194 </dt>
2195 <dd>
2196 <p>
2198 </p>
2199 </dd>
2201 -z
2202 </dt>
2203 <dd>
2204 <p>
2205 Separate the commits with NULs instead of with new newlines.
2206 </p>
2207 <div class="paragraph"><p>Also, when <tt>--raw</tt> or <tt>--numstat</tt> has been given, do not munge
2208 pathnames and use NULs as output field terminators.</p></div>
2209 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
2211 respectively, and the pathname will be enclosed in double quotes if
2212 any of those replacements occurred.</p></div>
2213 </dd>
2215 --name-only
2216 </dt>
2217 <dd>
2218 <p>
2219 Show only names of changed files.
2220 </p>
2221 </dd>
2223 --name-status
2224 </dt>
2225 <dd>
2226 <p>
2227 Show only names and status of changed files. See the description
2228 of the <tt>--diff-filter</tt> option on what the status letters mean.
2229 </p>
2230 </dd>
2232 --submodule[=<format>]
2233 </dt>
2234 <dd>
2235 <p>
2236 Chose the output format for submodule differences. <format> can be one of
2237 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
2238 is used when this option is not given. <em>log</em> is the default value for this
2239 option and lists the commits in that commit range like the <em>summary</em>
2241 </p>
2242 </dd>
2244 --color[=<when>]
2245 </dt>
2246 <dd>
2247 <p>
2248 Show colored diff.
2249 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
2250 The default value is <tt>never</tt>.
2251 </p>
2252 </dd>
2254 --no-color
2255 </dt>
2256 <dd>
2257 <p>
2258 Turn off colored diff.
2259 It is the same as <tt>--color=never</tt>.
2260 </p>
2261 </dd>
2263 --word-diff[=<mode>]
2264 </dt>
2265 <dd>
2266 <p>
2267 Show a word diff, using the <mode> to delimit changed words.
2268 By default, words are delimited by whitespace; see
2269 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
2270 must be one of:
2271 </p>
2274 color
2275 </dt>
2276 <dd>
2277 <p>
2278 Highlight changed words using only colors. Implies <tt>--color</tt>.
2279 </p>
2280 </dd>
2282 plain
2283 </dt>
2284 <dd>
2285 <p>
2286 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
2287 attempts to escape the delimiters if they appear in the input,
2288 so the output may be ambiguous.
2289 </p>
2290 </dd>
2292 porcelain
2293 </dt>
2294 <dd>
2295 <p>
2296 Use a special line-based format intended for script
2297 consumption. Added/removed/unchanged runs are printed in the
2298 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
2299 character at the beginning of the line and extending to the
2300 end of the line. Newlines in the input are represented by a
2301 tilde <tt>~</tt> on a line of its own.
2302 </p>
2303 </dd>
2305 none
2306 </dt>
2307 <dd>
2308 <p>
2309 Disable word diff again.
2310 </p>
2311 </dd>
2312 </dl></div>
2314 highlight the changed parts in all modes if enabled.</p></div>
2315 </dd>
2317 --word-diff-regex=<regex>
2318 </dt>
2319 <dd>
2320 <p>
2321 Use <regex> to decide what a word is, instead of considering
2322 runs of non-whitespace to be a word. Also implies
2323 <tt>--word-diff</tt> unless it was already enabled.
2324 </p>
2326 <regex> is considered a word. Anything between these matches is
2327 considered whitespace and ignored(!) for the purposes of finding
2328 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
2329 expression to make sure that it matches all non-whitespace characters.
2330 A match that contains a newline is silently truncated(!) at the
2331 newline.</p></div>
2332 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
2333 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
2334 overrides any diff driver or configuration setting. Diff drivers
2335 override configuration settings.</p></div>
2336 </dd>
2338 --color-words[=<regex>]
2339 </dt>
2340 <dd>
2341 <p>
2342 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
2343 specified) <tt>--word-diff-regex=<regex></tt>.
2344 </p>
2345 </dd>
2347 --no-renames
2348 </dt>
2349 <dd>
2350 <p>
2351 Turn off rename detection, even when the configuration
2352 file gives the default to do so.
2353 </p>
2354 </dd>
2356 --check
2357 </dt>
2358 <dd>
2359 <p>
2360 Warn if changes introduce trailing whitespace
2361 or an indent that uses a space before a tab. Exits with
2362 non-zero status if problems are found. Not compatible with
2363 --exit-code.
2364 </p>
2365 </dd>
2367 --full-index
2368 </dt>
2369 <dd>
2370 <p>
2371 Instead of the first handful of characters, show the full
2373 line when generating patch format output.
2374 </p>
2375 </dd>
2377 --binary
2378 </dt>
2379 <dd>
2380 <p>
2381 In addition to <tt>--full-index</tt>, output a binary diff that
2382 can be applied with <tt>git-apply</tt>.
2383 </p>
2384 </dd>
2386 --abbrev[=<n>]
2387 </dt>
2388 <dd>
2389 <p>
2390 Instead of showing the full 40-byte hexadecimal object
2391 name in diff-raw format output and diff-tree header
2392 lines, show only a partial prefix. This is
2393 independent of the <tt>--full-index</tt> option above, which controls
2394 the diff-patch output format. Non default number of
2395 digits can be specified with <tt>--abbrev=<n></tt>.
2396 </p>
2397 </dd>
2399 -B[<n>][/<m>]
2400 </dt>
2402 --break-rewrites[=[<n>][/<m>]]
2403 </dt>
2404 <dd>
2405 <p>
2406 Break complete rewrite changes into pairs of delete and
2407 create. This serves two purposes:
2408 </p>
2409 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
2410 not as a series of deletion and insertion mixed together with a very
2411 few lines that happen to match textually as the context, but as a
2412 single deletion of everything old followed by a single insertion of
2413 everything new, and the number <tt>m</tt> controls this aspect of the -B
2414 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
2415 original should remain in the result for git to consider it a total
2416 rewrite (i.e. otherwise the resulting patch will be a series of
2417 deletion and insertion mixed together with context lines).</p></div>
2418 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
2419 source of a rename (usually -M only considers a file that disappeared
2420 as the source of a rename), and the number <tt>n</tt> controls this aspect of
2421 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
2422 addition and deletion compared to 20% or more of the file’s size are
2423 eligible for being picked up as a possible source of a rename to
2424 another file.</p></div>
2425 </dd>
2427 -M[<n>]
2428 </dt>
2430 --find-renames[=<n>]
2431 </dt>
2432 <dd>
2433 <p>
2434 If generating diffs, detect and report renames for each commit.
2435 For following files across renames while traversing history, see
2436 <tt>--follow</tt>.
2437 If <tt>n</tt> is specified, it is a threshold on the similarity
2438 index (i.e. amount of addition/deletions compared to the
2439 file’s size). For example, <tt>-M90%</tt> means git should consider a
2440 delete/add pair to be a rename if more than 90% of the file
2441 hasn’t changed.
2442 </p>
2443 </dd>
2445 -C[<n>]
2446 </dt>
2448 --find-copies[=<n>]
2449 </dt>
2450 <dd>
2451 <p>
2452 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
2453 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
2454 </p>
2455 </dd>
2457 --find-copies-harder
2458 </dt>
2459 <dd>
2460 <p>
2461 For performance reasons, by default, <tt>-C</tt> option finds copies only
2462 if the original file of the copy was modified in the same
2463 changeset. This flag makes the command
2464 inspect unmodified files as candidates for the source of
2465 copy. This is a very expensive operation for large
2466 projects, so use it with caution. Giving more than one
2467 <tt>-C</tt> option has the same effect.
2468 </p>
2469 </dd>
2471 -D
2472 </dt>
2474 --irreversible-delete
2475 </dt>
2476 <dd>
2477 <p>
2478 Omit the preimage for deletes, i.e. print only the header but not
2479 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
2480 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
2481 solely for people who want to just concentrate on reviewing the
2482 text after the change. In addition, the output obviously lack
2483 enough information to apply such a patch in reverse, even manually,
2484 hence the name of the option.
2485 </p>
2486 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
2487 of a delete/create pair.</p></div>
2488 </dd>
2490 -l<num>
2491 </dt>
2492 <dd>
2493 <p>
2494 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
2495 is the number of potential rename/copy targets. This
2496 option prevents rename/copy detection from running if
2497 the number of rename/copy targets exceeds the specified
2498 number.
2499 </p>
2500 </dd>
2502 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
2503 </dt>
2504 <dd>
2505 <p>
2506 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
2507 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
2508 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
2509 are Unmerged (<tt>U</tt>), are
2510 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
2511 Any combination of the filter characters (including none) can be used.
2512 When <tt>*</tt> (All-or-none) is added to the combination, all
2513 paths are selected if there is any file that matches
2514 other criteria in the comparison; if there is no file
2515 that matches other criteria, nothing is selected.
2516 </p>
2517 </dd>
2519 -S<string>
2520 </dt>
2521 <dd>
2522 <p>
2523 Look for differences that introduce or remove an instance of
2524 <string>. Note that this is different than the string simply
2525 appearing in diff output; see the <em>pickaxe</em> entry in
2527 </p>
2528 </dd>
2530 -G<regex>
2531 </dt>
2532 <dd>
2533 <p>
2534 Look for differences whose added or removed line matches
2535 the given <regex>.
2536 </p>
2537 </dd>
2539 --pickaxe-all
2540 </dt>
2541 <dd>
2542 <p>
2543 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
2544 changeset, not just the files that contain the change
2545 in <string>.
2546 </p>
2547 </dd>
2549 --pickaxe-regex
2550 </dt>
2551 <dd>
2552 <p>
2553 Make the <string> not a plain string but an extended POSIX
2554 regex to match.
2555 </p>
2556 </dd>
2558 -O<orderfile>
2559 </dt>
2560 <dd>
2561 <p>
2562 Output the patch in the order specified in the
2563 <orderfile>, which has one shell glob pattern per line.
2564 </p>
2565 </dd>
2567 -R
2568 </dt>
2569 <dd>
2570 <p>
2571 Swap two inputs; that is, show differences from index or
2572 on-disk file to tree contents.
2573 </p>
2574 </dd>
2576 --relative[=<path>]
2577 </dt>
2578 <dd>
2579 <p>
2580 When run from a subdirectory of the project, it can be
2581 told to exclude changes outside the directory and show
2582 pathnames relative to it with this option. When you are
2583 not in a subdirectory (e.g. in a bare repository), you
2584 can name which subdirectory to make the output relative
2585 to by giving a <path> as an argument.
2586 </p>
2587 </dd>
2589 -a
2590 </dt>
2592 --text
2593 </dt>
2594 <dd>
2595 <p>
2596 Treat all files as text.
2597 </p>
2598 </dd>
2600 --ignore-space-at-eol
2601 </dt>
2602 <dd>
2603 <p>
2604 Ignore changes in whitespace at EOL.
2605 </p>
2606 </dd>
2608 -b
2609 </dt>
2611 --ignore-space-change
2612 </dt>
2613 <dd>
2614 <p>
2615 Ignore changes in amount of whitespace. This ignores whitespace
2616 at line end, and considers all other sequences of one or
2617 more whitespace characters to be equivalent.
2618 </p>
2619 </dd>
2621 -w
2622 </dt>
2624 --ignore-all-space
2625 </dt>
2626 <dd>
2627 <p>
2628 Ignore whitespace when comparing lines. This ignores
2629 differences even if one line has whitespace where the other
2630 line has none.
2631 </p>
2632 </dd>
2634 --inter-hunk-context=<lines>
2635 </dt>
2636 <dd>
2637 <p>
2638 Show the context between diff hunks, up to the specified number
2639 of lines, thereby fusing hunks that are close to each other.
2640 </p>
2641 </dd>
2643 --exit-code
2644 </dt>
2645 <dd>
2646 <p>
2647 Make the program exit with codes similar to diff(1).
2648 That is, it exits with 1 if there were differences and
2649 0 means no differences.
2650 </p>
2651 </dd>
2653 --quiet
2654 </dt>
2655 <dd>
2656 <p>
2657 Disable all output of the program. Implies <tt>--exit-code</tt>.
2658 </p>
2659 </dd>
2661 --ext-diff
2662 </dt>
2663 <dd>
2664 <p>
2665 Allow an external diff helper to be executed. If you set an
2668 </p>
2669 </dd>
2671 --no-ext-diff
2672 </dt>
2673 <dd>
2674 <p>
2675 Disallow external diff drivers.
2676 </p>
2677 </dd>
2679 --ignore-submodules[=<when>]
2680 </dt>
2681 <dd>
2682 <p>
2683 Ignore changes to submodules in the diff generation. <when> can be
2686 untracked or modified files or its HEAD differs from the commit recorded
2687 in the superproject and can be used to override any settings of the
2688 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2690 contain untracked content (but they are still scanned for modified
2692 only changes to the commits stored in the superproject are shown (this was
2694 </p>
2695 </dd>
2697 --src-prefix=<prefix>
2698 </dt>
2699 <dd>
2700 <p>
2702 </p>
2703 </dd>
2705 --dst-prefix=<prefix>
2706 </dt>
2707 <dd>
2708 <p>
2710 </p>
2711 </dd>
2713 --no-prefix
2714 </dt>
2715 <dd>
2716 <p>
2717 Do not show any source or destination prefix.
2718 </p>
2719 </dd>
2720 </dl></div>
2723 </div>
2729 do not produce the output described above; instead they produce a
2730 patch file. You can customize the creation of such patches via the
2731 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
2732 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2733 diff format:</p></div>
2735 <li>
2736 <p>
2738 </p>
2741 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2742 </div></div>
2743 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2744 involved. Especially, even for a creation or a deletion,
2745 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2746 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
2747 name of the source file of the rename/copy and the name of
2748 the file that rename/copy produces, respectively.</p></div>
2749 </li>
2750 <li>
2751 <p>
2752 It is followed by one or more extended header lines:
2753 </p>
2756 <pre><tt>old mode <mode>
2757 new mode <mode>
2758 deleted file mode <mode>
2759 new file mode <mode>
2760 copy from <path>
2761 copy to <path>
2762 rename from <path>
2763 rename to <path>
2764 similarity index <number>
2765 dissimilarity index <number>
2766 index <hash>..<hash> <mode></tt></pre>
2767 </div></div>
2768 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2769 and file permission bits.</p></div>
2770 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
2772 the dissimilarity index is the percentage of changed lines. It
2773 is a rounded down integer, followed by a percent sign. The
2774 similarity index value of 100% is thus reserved for two equal
2775 files, while 100% dissimilarity means that no line from the old
2776 file made it into the new one.</p></div>
2777 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
2778 The <mode> is included if the file mode does not change; otherwise,
2779 separate lines indicate the old and the new mode.</p></div>
2780 </li>
2781 <li>
2782 <p>
2783 TAB, LF, double quote and backslash characters in pathnames
2785 If there is need for such substitution then the whole
2786 pathname is put in double quotes.
2787 </p>
2788 </li>
2789 <li>
2790 <p>
2793 It is incorrect to apply each change to each file sequentially. For
2794 example, this patch will swap a and b:
2795 </p>
2798 <pre><tt>diff --git a/a b/b
2799 rename from a
2800 rename to b
2801 diff --git a/b b/a
2802 rename from b
2803 rename to a</tt></pre>
2804 </div></div>
2805 </li>
2806 </ol></div>
2807 </div>
2810 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
2813 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
2814 of these commands to force generation of diffs with individual parents
2815 of a merge.</p></div>
2819 <pre><tt>diff --combined describe.c
2820 index fabadb8,cc95eb0..4866510
2821 --- a/describe.c
2822 +++ b/describe.c
2825 }
2827 - static void describe(char *arg)
2828 -static void describe(struct commit *cmit, int last_one)
2829 ++static void describe(char *arg, int last_one)
2830 {
2831 + unsigned char sha1[20];
2832 + struct commit *cmit;
2833 struct commit_list *list;
2834 static int initialized = 0;
2835 struct commit_name *n;
2838 + usage(describe_usage);
2839 + cmit = lookup_commit_reference(sha1);
2840 + if (!cmit)
2841 + usage(describe_usage);
2842 +
2843 if (!initialized) {
2844 initialized = 1;
2845 for_each_ref(get_name);</tt></pre>
2846 </div></div>
2848 <li>
2849 <p>
2850 It is preceded with a "git diff" header, that looks like
2852 </p>
2856 </div></div>
2861 </div></div>
2862 </li>
2863 <li>
2864 <p>
2865 It is followed by one or more extended header lines
2866 (this example shows a merge with two parents):
2867 </p>
2874 </div></div>
2875 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
2877 information about detected contents movement (renames and
2878 copying detection) are designed to work with diff of two
2880 </li>
2881 <li>
2882 <p>
2883 It is followed by two-line from-file/to-file header
2884 </p>
2887 <pre><tt>--- a/file
2888 +++ b/file</tt></pre>
2889 </div></div>
2892 files.</p></div>
2893 </li>
2894 <li>
2895 <p>
2896 Chunk header format is modified to prevent people from
2898 was created for review of merge commit changes, and was not
2899 meant for apply. The change is similar to the change in the
2901 </p>
2904 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
2905 </div></div>
2907 header for combined diff format.</p></div>
2908 </li>
2909 </ol></div>
2911 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
2913 compares two or more files file1, file2,… with one file X, and
2914 shows how X differs from each of fileN. One column for each of
2915 fileN is prepended to the output line to note how X’s line is
2916 different from it.</p></div>
2917 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
2919 in the column N means that the line appears in the result,
2920 and fileN does not have that line (in other words, the line was
2921 added, from the point of view of that parent).</p></div>
2925 in either file1 nor file2). Also eight other lines are the same
2927 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
2928 merge commit with the merge result (i.e. file1..fileN are the
2930 two unresolved merge parents with the working tree file
2933 </div>
2938 git log --no-merges
2939 </dt>
2940 <dd>
2941 <p>
2942 Show the whole commit history, but skip any merges
2943 </p>
2944 </dd>
2946 git log v2.6.12.. include/scsi drivers/scsi
2947 </dt>
2948 <dd>
2949 <p>
2951 in the include/scsi or drivers/scsi subdirectories
2952 </p>
2953 </dd>
2956 </dt>
2957 <dd>
2958 <p>
2962 </p>
2963 </dd>
2965 git log --name-status release..test
2966 </dt>
2967 <dd>
2968 <p>
2969 Show the commits that are in the "test" branch but not yet
2970 in the "release" branch, along with the list of paths
2971 each commit modifies.
2972 </p>
2973 </dd>
2975 git log --follow builtin-rev-list.c
2976 </dt>
2977 <dd>
2978 <p>
2979 Shows the commits that changed builtin-rev-list.c, including
2980 those commits that occurred before the file was given its
2981 present name.
2982 </p>
2983 </dd>
2985 git log --branches --not --remotes=origin
2986 </dt>
2987 <dd>
2988 <p>
2989 Shows all commits that are in any of local branches but not in
2991 origin doesn’t).
2992 </p>
2993 </dd>
2995 git log master --not --remotes=*/master
2996 </dt>
2997 <dd>
2998 <p>
2999 Shows all commits that are in local master but not in any remote
3000 repository master branches.
3001 </p>
3002 </dd>
3004 git log -p -m --first-parent
3005 </dt>
3006 <dd>
3007 <p>
3008 Shows the history including change diffs, but only from the
3009 "main branch" perspective, skipping commits that come from merged
3010 branches, and showing full diffs of changes introduced by the merges.
3011 This makes sense only when following a strict policy of merging all
3012 topic branches when staying on a single integration branch.
3013 </p>
3014 </dd>
3015 </dl></div>
3016 </div>
3021 <li>
3022 <p>
3023 The pathnames recorded in the index and in the tree objects
3024 are treated as uninterpreted sequences of non-NUL bytes.
3025 What readdir(2) returns are what are recorded and compared
3026 with the data git keeps track of, which in turn are expected
3028 thing as pathname encoding translation.
3029 </p>
3030 </li>
3031 <li>
3032 <p>
3033 The contents of the blob objects are uninterpreted sequences
3034 of bytes. There is no encoding translation at the core
3035 level.
3036 </p>
3037 </li>
3038 <li>
3039 <p>
3040 The commit log messages are uninterpreted sequences of non-NUL
3041 bytes.
3042 </p>
3043 </li>
3044 </ul></div>
3046 in UTF-8, both the core and git Porcelain are designed not to
3047 force UTF-8 on projects. If all participants of a particular
3048 project find it more convenient to use legacy encodings, git
3049 does not forbid it. However, there are a few things to keep in
3050 mind.</p></div>
3052 <li>
3053 <p>
3055 a warning if the commit log message given to it does not look
3056 like a valid UTF-8 string, unless you explicitly say your
3057 project uses a legacy encoding. The way to say this is to
3059 </p>
3062 <pre><tt>[i18n]
3064 </div></div>
3067 help other people who look at them later. Lack of this header
3069 </li>
3070 <li>
3071 <p>
3074 log message into UTF-8 unless otherwise specified. You can
3075 specify the desired output encoding with
3077 </p>
3080 <pre><tt>[i18n]
3082 </div></div>
3085 </li>
3086 </ol></div>
3088 message when a commit is made to force UTF-8 at the commit
3089 object level, because re-coding to UTF-8 is not necessarily a
3090 reversible operation.</p></div>
3091 </div>
3094 <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>
3095 for settings related to diff generation.</p></div>
3098 format.pretty
3099 </dt>
3100 <dd>
3101 <p>
3103 Defaults to "medium".
3104 </p>
3105 </dd>
3107 i18n.logOutputEncoding
3108 </dt>
3109 <dd>
3110 <p>
3111 Encoding to use when displaying logs. (See "Discussion", above.)
3113 otherwise.
3114 </p>
3115 </dd>
3117 log.date
3118 </dt>
3119 <dd>
3120 <p>
3121 Default format for human-readable dates. (Compare the
3124 </p>
3125 </dd>
3127 log.showroot
3128 </dt>
3129 <dd>
3130 <p>
3132 initial commit as a big creation event. Any root commits in
3135 </p>
3136 </dd>
3138 mailmap.file
3139 </dt>
3140 <dd>
3141 <p>
3143 </p>
3144 </dd>
3146 notes.displayRef
3147 </dt>
3148 <dd>
3149 <p>
3154 </p>
3156 multiple times. A warning will be issued for refs that do not exist,
3157 but a glob that does not match any refs is silently ignored.</p></div>
3161 </dd>
3162 </dl></div>
3163 </div>
3167 </div>
3171 </div>
3172 </div>
3173 </body>
3174 </html>