| blob | 1e0c55b2de8f442a70071b46f5a3a5e53fe6dc0e |
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>
418 <div class="verseblock-content"><em>git log</em> [<options>] [<since>..<until>] [[--] <path>…]</div>
420 </div></div>
421 </div>
426 command to control what is shown and how, and options applicable to
428 each commit introduces are shown.</p></div>
429 </div>
435 </dt>
436 <dd>
437 <p>
438 Limits the number of commits to show.
439 Note that this is a commit limiting option, see below.
440 </p>
441 </dd>
444 </dt>
445 <dd>
446 <p>
447 Show only commits between the named two commits. When
452 </p>
453 </dd>
455 --follow
456 </dt>
457 <dd>
458 <p>
459 Continue listing the history of a file beyond renames
460 (works only for a single file).
461 </p>
462 </dd>
464 --no-decorate
465 </dt>
467 --decorate[=short|full|no]
468 </dt>
469 <dd>
470 <p>
474 full ref name (including prefix) will be printed. The default option
476 </p>
477 </dd>
479 --source
480 </dt>
481 <dd>
482 <p>
483 Print out the ref name given on the command line by which each
484 commit was reached.
485 </p>
486 </dd>
488 --full-diff
489 </dt>
490 <dd>
491 <p>
492 Without this flag, "git log -p <path>…" shows commits that
493 touch the specified paths, and diffs about the same specified
494 paths. With this, the full diff is shown for commits that touch
495 the specified paths; this means that "<path>…" limits only
496 commits, and doesn’t limit diff for those commits.
497 </p>
499 produced by --stat etc.</p></div>
500 </dd>
502 --log-size
503 </dt>
504 <dd>
505 <p>
506 Before the log message print out its size in bytes. Intended
507 mainly for porcelain tools consumption. If git is unable to
508 produce a valid value size is set to zero.
509 Note that only message is considered, if also a diff is shown
510 its size is not included.
511 </p>
512 </dd>
515 </dt>
516 <dd>
517 <p>
518 Show only commits that affect any of the specified paths. To
519 prevent confusion with options and branch names, paths may need
520 to be prefixed with "-- " to separate them from options or
521 refnames.
522 </p>
523 </dd>
524 </dl></div>
527 special notations explained in the description, additional commit
528 limiting may be applied. Note that they are applied before commit
533 </dt>
536 </dt>
537 <dd>
538 <p>
539 Limit the number of commits to output.
540 </p>
541 </dd>
544 </dt>
545 <dd>
546 <p>
548 </p>
549 </dd>
552 </dt>
555 </dt>
556 <dd>
557 <p>
558 Show commits more recent than a specific date.
559 </p>
560 </dd>
563 </dt>
566 </dt>
567 <dd>
568 <p>
569 Show commits older than a specific date.
570 </p>
571 </dd>
574 </dt>
577 </dt>
578 <dd>
579 <p>
580 Limit the commits output to ones with author/committer
581 header lines that match the specified pattern (regular expression).
582 </p>
583 </dd>
586 </dt>
587 <dd>
588 <p>
589 Limit the commits output to ones with log message that
590 matches the specified pattern (regular expression).
591 </p>
592 </dd>
594 --all-match
595 </dt>
596 <dd>
597 <p>
598 Limit the commits output to ones that match all given --grep,
599 --author and --committer instead of ones that match at least one.
600 </p>
601 </dd>
603 -i
604 </dt>
606 --regexp-ignore-case
607 </dt>
608 <dd>
609 <p>
610 Match the regexp limiting patterns without regard to letters case.
611 </p>
612 </dd>
614 -E
615 </dt>
617 --extended-regexp
618 </dt>
619 <dd>
620 <p>
621 Consider the limiting patterns to be extended regular expressions
622 instead of the default basic regular expressions.
623 </p>
624 </dd>
626 -F
627 </dt>
629 --fixed-strings
630 </dt>
631 <dd>
632 <p>
633 Consider the limiting patterns to be fixed strings (don’t interpret
634 pattern as a regular expression).
635 </p>
636 </dd>
638 --remove-empty
639 </dt>
640 <dd>
641 <p>
642 Stop when a given path disappears from the tree.
643 </p>
644 </dd>
646 --merges
647 </dt>
648 <dd>
649 <p>
651 </p>
652 </dd>
654 --no-merges
655 </dt>
656 <dd>
657 <p>
658 Do not print commits with more than one parent. This is
660 </p>
661 </dd>
664 </dt>
667 </dt>
669 --no-min-parents
670 </dt>
672 --no-max-parents
673 </dt>
674 <dd>
675 <p>
676 Show only commits which have at least (or at most) that many
680 </p>
681 <div class="paragraph"><p><tt>--no-min-parents</tt> and <tt>--no-max-parents</tt> reset these limits (to no limit)
684 </dd>
686 --first-parent
687 </dt>
688 <dd>
689 <p>
690 Follow only the first parent commit upon seeing a merge
691 commit. This option can give a better overview when
692 viewing the evolution of a particular topic branch,
693 because merges into a topic branch tend to be only about
694 adjusting to updated upstream from time to time, and
695 this option allows you to ignore the individual commits
696 brought in to your history by such a merge.
697 </p>
698 </dd>
700 --not
701 </dt>
702 <dd>
703 <p>
706 </p>
707 </dd>
709 --all
710 </dt>
711 <dd>
712 <p>
715 </p>
716 </dd>
719 </dt>
720 <dd>
721 <p>
726 </p>
727 </dd>
730 </dt>
731 <dd>
732 <p>
737 </p>
738 </dd>
741 </dt>
742 <dd>
743 <p>
746 remote-tracking branches to ones matching given shell glob.
747 If pattern lacks <em>?</em>, <em><strong></em>, or <em>[</em>, <em>/</strong></em> at the end is implied.
748 </p>
749 </dd>
752 </dt>
753 <dd>
754 <p>
759 </p>
760 </dd>
762 --ignore-missing
763 </dt>
764 <dd>
765 <p>
766 Upon seeing an invalid object name in the input, pretend as if
767 the bad input was not given.
768 </p>
769 </dd>
771 --bisect
772 </dt>
773 <dd>
774 <p>
778 line.
779 </p>
780 </dd>
782 --stdin
783 </dt>
784 <dd>
785 <p>
788 seen, stop reading commits and start reading paths to limit the
789 result.
790 </p>
791 </dd>
793 --cherry-mark
794 </dt>
795 <dd>
796 <p>
799 </p>
800 </dd>
802 --cherry-pick
803 </dt>
804 <dd>
805 <p>
806 Omit any commit that introduces the same change as
807 another commit on the "other side" when the set of
808 commits are limited with symmetric difference.
809 </p>
810 <div class="paragraph"><p>For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way
811 to list all commits on only one side of them is with
814 from the other branch (for example, "3rd on b" may be cherry-picked
815 from branch A). With this option, such pairs of commits are
816 excluded from the output.</p></div>
817 </dd>
819 --left-only
820 </dt>
822 --right-only
823 </dt>
824 <dd>
825 <p>
826 List only commits on the respective side of a symmetric range,
829 </p>
830 <div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A…B</tt> omits those
834 list.</p></div>
835 </dd>
837 --cherry
838 </dt>
839 <dd>
840 <p>
842 limit the output to the commits on our side and mark those that
843 have been applied to the other side of a forked history with
846 </p>
847 </dd>
849 -g
850 </dt>
852 --walk-reflogs
853 </dt>
854 <dd>
855 <p>
856 Instead of walking the commit ancestry chain, walk
857 reflog entries from the most recent one to older ones.
858 When this option is used you cannot specify commits to
861 </p>
862 <div class="paragraph"><p>With <em>--pretty</em> format other than oneline (for obvious reasons),
863 this causes the output to have two extra lines of information
865 used in the output. When the starting commit is specified as
868 prefixed with this information on the same line.
871 </dd>
873 --merge
874 </dt>
875 <dd>
876 <p>
877 After a failed merge, show refs that touch files having a
878 conflict and don’t exist on all heads to merge.
879 </p>
880 </dd>
882 --boundary
883 </dt>
884 <dd>
885 <p>
886 Output uninteresting commits at the boundary, which are usually
887 not shown.
888 </p>
889 </dd>
890 </dl></div>
892 <div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the
895 is how to do it, as there are various strategies to simplify the history.</p></div>
900 </dt>
901 <dd>
902 <p>
904 </p>
905 </dd>
907 --simplify-by-decoration
908 </dt>
909 <dd>
910 <p>
911 Commits that are referred by some branch or tag are selected.
912 </p>
913 </dd>
914 </dl></div>
915 <div class="paragraph"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
916 <div class="paragraph"><p>The following options affect the way the simplification is performed:</p></div>
919 Default mode
920 </dt>
921 <dd>
922 <p>
923 Simplifies the history to the simplest history explaining the
924 final state of the tree. Simplest because it prunes some side
925 branches if the end result is the same (i.e. merging branches
926 with the same content)
927 </p>
928 </dd>
930 --full-history
931 </dt>
932 <dd>
933 <p>
934 Same as the default mode, but does not prune some history.
935 </p>
936 </dd>
938 --dense
939 </dt>
940 <dd>
941 <p>
942 Only the selected commits are shown, plus some to have a
943 meaningful history.
944 </p>
945 </dd>
947 --sparse
948 </dt>
949 <dd>
950 <p>
951 All commits in the simplified history are shown.
952 </p>
953 </dd>
955 --simplify-merges
956 </dt>
957 <dd>
958 <p>
960 merges from the resulting history, as there are no selected
961 commits contributing to this merge.
962 </p>
963 </dd>
965 --ancestry-path
966 </dt>
967 <dd>
968 <p>
974 </p>
975 </dd>
976 </dl></div>
978 <div class="paragraph"><p>Suppose you specified <tt>foo</tt> as the <paths>. We shall call commits
982 illustrate the differences between simplification settings. We assume
986 <pre><tt> .-A---M---N---O---P
987 / / / / /
988 I B C D E
989 \ / / / /
990 `-------------'</tt></pre>
991 </div></div>
992 <div class="paragraph"><p>The horizontal line of history A---P is taken to be the first parent of
993 each merge. The commits are:</p></div>
995 <li>
996 <p>
1000 </p>
1001 </li>
1002 <li>
1003 <p>
1005 </p>
1006 </li>
1007 <li>
1008 <p>
1010 hence TREESAME to all parents.
1011 </p>
1012 </li>
1013 <li>
1014 <p>
1016 so it is not TREESAME to any parent.
1017 </p>
1018 </li>
1019 <li>
1020 <p>
1023 </p>
1024 </li>
1025 <li>
1026 <p>
1029 TREESAME to all parents.
1030 </p>
1031 </li>
1032 </ul></div>
1033 <div class="paragraph"><p><em>rev-list</em> walks backwards through history, including or excluding
1036 are available.</p></div>
1039 Default mode
1040 </dt>
1041 <dd>
1042 <p>
1043 Commits are included if they are not TREESAME to any parent
1045 commit was a merge, and it was TREESAME to one parent, follow
1046 only that parent. (Even if there are several TREESAME
1047 parents, follow only one of them.) Otherwise, follow all
1048 parents.
1049 </p>
1053 <pre><tt> .-A---N---O
1054 / / /
1055 I---------D</tt></pre>
1056 </div></div>
1061 <div class="paragraph"><p>Parent/child relations are only visible with --parents, but that does
1062 not affect the commits selected in default mode, so we have shown the
1063 parent lines.</p></div>
1064 </dd>
1066 --full-history without parent rewriting
1067 </dt>
1068 <dd>
1069 <p>
1070 This mode differs from the default in one point: always follow
1071 all parents of a merge, even if it is TREESAME to one of them.
1072 Even if more than one side of the merge has commits that are
1073 included, this does not imply that the merge itself is! In
1074 the example, we get
1075 </p>
1079 </div></div>
1080 <div class="paragraph"><p><tt>P</tt> and <tt>M</tt> were excluded because they are TREESAME to a parent. <tt>E</tt>,
1082 do not appear.</p></div>
1083 <div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk
1084 about the parent/child relationships between the commits, so we show
1085 them disconnected.</p></div>
1086 </dd>
1088 --full-history with parent rewriting
1089 </dt>
1090 <dd>
1091 <p>
1092 Ordinary commits are only included if they are !TREESAME
1094 </p>
1096 Along each parent, prune away commits that are not included
1097 themselves. This results in</p></div>
1100 <pre><tt> .-A---M---N---O---P
1101 / / / / /
1102 I B / D /
1103 \ / / / /
1104 `-------------'</tt></pre>
1105 </div></div>
1106 <div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt>
1107 was pruned away because it is TREESAME, but the parent list of P was
1110 </dd>
1111 </dl></div>
1113 affects inclusion:</p></div>
1116 --dense
1117 </dt>
1118 <dd>
1119 <p>
1120 Commits that are walked are included if they are not TREESAME
1121 to any parent.
1122 </p>
1123 </dd>
1125 --sparse
1126 </dt>
1127 <dd>
1128 <p>
1129 All commits that are walked are included.
1130 </p>
1131 <div class="paragraph"><p>Note that without <em>--full-history</em>, this still simplifies merges: if
1132 one of the parents is TREESAME, we follow only that one, so the other
1133 sides of the merge are never walked.</p></div>
1134 </dd>
1136 --simplify-merges
1137 </dt>
1138 <dd>
1139 <p>
1140 First, build a history graph in the same way that
1142 </p>
1143 <div class="paragraph"><p>Then simplify each commit ‘C` to its replacement <tt>C’</tt> in the final
1144 history according to the following rules:</p></div>
1146 <li>
1147 <p>
1149 </p>
1150 </li>
1151 <li>
1152 <p>
1153 Replace each parent ‘P` of <tt>C’</tt> with its simplification ‘P’`. In
1154 the process, drop parents that are ancestors of other parents, and
1155 remove duplicates.
1156 </p>
1157 </li>
1158 <li>
1159 <p>
1162 Otherwise, it is replaced with its only parent.
1163 </p>
1164 </li>
1165 </ul></div>
1170 <pre><tt> .-A---M---N---O
1171 / / /
1172 I B D
1173 \ / /
1174 `---------'</tt></pre>
1175 </div></div>
1176 <div class="paragraph"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div>
1178 <li>
1179 <p>
1182 </p>
1183 </li>
1184 <li>
1185 <p>
1187 removed completely, because it had one parent and is TREESAME.
1188 </p>
1189 </li>
1190 </ul></div>
1191 </dd>
1192 </dl></div>
1196 --ancestry-path
1197 </dt>
1198 <dd>
1199 <p>
1200 Limit the displayed commits to those directly on the ancestry
1202 range. I.e. only display commits that are ancestor of the "to"
1203 commit, and descendants of the "from" commit.
1204 </p>
1205 <div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
1208 <pre><tt> D---E-------F
1209 / \ \
1210 B---C---G---H---I---J
1211 / \
1212 A-------K---------------L--M</tt></pre>
1213 </div></div>
1214 <div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <tt>M</tt>,
1217 that "what does <tt>M</tt> have that did not exist in <tt>D</tt>". The result in this
1219 of course).</p></div>
1220 <div class="paragraph"><p>When we want to find out what commits in <tt>M</tt> are contaminated with the
1227 <pre><tt> E-------F
1228 \ \
1229 G---H---I---J
1230 \
1231 L--M</tt></pre>
1232 </div></div>
1233 </dd>
1234 </dl></div>
1235 <div class="paragraph"><p>The <em>--simplify-by-decoration</em> option allows you to view only the
1236 big picture of the topology of the history, by omitting commits
1237 that are not referenced by tags. Commits are marked as !TREESAME
1238 (in other words, kept after history simplification rules described
1240 contents of the paths given on the command line. All other
1241 commits are marked as TREESAME (subject to be simplified away).</p></div>
1243 <div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>
1246 --topo-order
1247 </dt>
1248 <dd>
1249 <p>
1250 This option makes them appear in topological order (i.e.
1251 descendant commits are shown before their parents).
1252 </p>
1253 </dd>
1255 --date-order
1256 </dt>
1257 <dd>
1258 <p>
1260 parent comes before all of its children, but otherwise things
1261 are still ordered in the commit timestamp order.
1262 </p>
1263 </dd>
1265 --reverse
1266 </dt>
1267 <dd>
1268 <p>
1269 Output the commits in reverse order.
1271 </p>
1272 </dd>
1273 </dl></div>
1275 <div class="paragraph"><p>These options are mostly targeted for packing of git repositories.</p></div>
1278 --objects
1279 </dt>
1280 <dd>
1281 <p>
1282 Print the object IDs of any object referenced by the listed
1284 all object IDs which I need to download if I have the commit
1285 object <em>bar</em>, but not <em>foo</em>".
1286 </p>
1287 </dd>
1289 --objects-edge
1290 </dt>
1291 <dd>
1292 <p>
1294 commits prefixed with a "-" character. This is used by
1296 objects in deltified form based on objects contained in these
1297 excluded commits to reduce network traffic.
1298 </p>
1299 </dd>
1301 --unpacked
1302 </dt>
1303 <dd>
1304 <p>
1306 in packs.
1307 </p>
1308 </dd>
1310 --no-walk
1311 </dt>
1312 <dd>
1313 <p>
1314 Only show the given revs, but do not traverse their ancestors.
1315 </p>
1316 </dd>
1318 --do-walk
1319 </dt>
1320 <dd>
1321 <p>
1322 Overrides a previous --no-walk.
1323 </p>
1324 </dd>
1325 </dl></div>
1330 </dt>
1333 </dt>
1334 <dd>
1335 <p>
1336 Pretty-print the contents of the commit logs in a given format,
1338 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See
1339 the "PRETTY FORMATS" section for some additional details for each
1341 </p>
1344 </dd>
1346 --abbrev-commit
1347 </dt>
1348 <dd>
1349 <p>
1350 Instead of showing the full 40-byte hexadecimal commit object
1351 name, show only a partial prefix. Non default number of
1352 digits can be specified with "--abbrev=<n>" (which also modifies
1353 diff output, if it is displayed).
1354 </p>
1357 </dd>
1359 --no-abbrev-commit
1360 </dt>
1361 <dd>
1362 <p>
1363 Show the full 40-byte hexadecimal commit object name. This negates
1366 </p>
1367 </dd>
1369 --oneline
1370 </dt>
1371 <dd>
1372 <p>
1373 This is a shorthand for "--pretty=oneline --abbrev-commit"
1374 used together.
1375 </p>
1376 </dd>
1379 </dt>
1380 <dd>
1381 <p>
1382 The commit objects record the encoding used for the log message
1383 in their encoding header; this option can be used to tell the
1384 command to re-code the commit log message in the encoding
1385 preferred by the user. For non plumbing commands this
1386 defaults to UTF-8.
1387 </p>
1388 </dd>
1391 </dt>
1392 <dd>
1393 <p>
1395 commit, when showing the commit log message. This is the default
1398 on the command line.
1399 </p>
1402 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
1403 <div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the
1405 is not qualified.</p></div>
1407 being displayed. Examples: "--notes=foo" will show only notes from
1410 </dd>
1412 --no-notes
1413 </dt>
1414 <dd>
1415 <p>
1417 resetting the list of notes refs from which notes are shown.
1418 Options are parsed in the order given on the command line, so e.g.
1419 "--notes --notes=foo --no-notes --notes=bar" will only show notes
1420 from "refs/notes/bar".
1421 </p>
1422 </dd>
1425 </dt>
1427 --[no-]standard-notes
1428 </dt>
1429 <dd>
1430 <p>
1431 These options are deprecated. Use the above --notes/--no-notes
1432 options instead.
1433 </p>
1434 </dd>
1436 --relative-date
1437 </dt>
1438 <dd>
1439 <p>
1441 </p>
1442 </dd>
1444 --date=(relative|local|default|iso|rfc|short|raw)
1445 </dt>
1446 <dd>
1447 <p>
1448 Only takes effect for dates shown in human-readable format, such
1450 value for log command’s --date option.
1451 </p>
1454 <div class="paragraph"><p><tt>--date=local</tt> shows timestamps in user’s local timezone.</p></div>
1455 <div class="paragraph"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div>
1456 <div class="paragraph"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822
1457 format, often found in E-mail messages.</p></div>
1458 <div class="paragraph"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div>
1459 <div class="paragraph"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div>
1462 </dd>
1464 --parents
1465 </dt>
1466 <dd>
1467 <p>
1468 Print also the parents of the commit (in the form "commit parent…").
1470 </p>
1471 </dd>
1473 --children
1474 </dt>
1475 <dd>
1476 <p>
1477 Print also the children of the commit (in the form "commit child…").
1479 </p>
1480 </dd>
1482 --left-right
1483 </dt>
1484 <dd>
1485 <p>
1486 Mark which side of a symmetric diff a commit is reachable from.
1490 </p>
1494 <pre><tt> y---b---b branch B
1495 / \ /
1496 / .
1497 / / \
1498 o---x---a---a branch A</tt></pre>
1499 </div></div>
1503 <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B
1509 -yyyyyyy... 1st on b
1511 </div></div>
1512 </dd>
1514 --graph
1515 </dt>
1516 <dd>
1517 <p>
1518 Draw a text-based graphical representation of the commit history
1519 on the left hand side of the output. This may cause extra lines
1520 to be printed in between commits, in order for the graph history
1521 to be drawn properly.
1522 </p>
1523 <div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>
1526 </dd>
1527 </dl></div>
1530 Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
1531 options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
1534 -c
1535 </dt>
1536 <dd>
1537 <p>
1538 With this option, diff output for a merge commit
1539 shows the differences from each of the parents to the merge result
1540 simultaneously instead of showing pairwise diff between a parent
1541 and the result one at a time. Furthermore, it lists only files
1542 which were modified from all parents.
1543 </p>
1544 </dd>
1546 --cc
1547 </dt>
1548 <dd>
1549 <p>
1551 patch output by omitting uninteresting hunks whose contents in
1552 the parents have only two variants and the merge result picks
1553 one of them without modification.
1554 </p>
1555 </dd>
1557 -m
1558 </dt>
1559 <dd>
1560 <p>
1561 This flag makes the merge commits show the full diff like
1562 regular commits; for each merge parent, a separate log entry
1563 and diff is generated. An exception is that only diff against
1565 in that case, the output represents the changes the merge
1567 </p>
1568 </dd>
1570 -r
1571 </dt>
1572 <dd>
1573 <p>
1574 Show recursive diffs.
1575 </p>
1576 </dd>
1578 -t
1579 </dt>
1580 <dd>
1581 <p>
1583 </p>
1584 </dd>
1586 -s
1587 </dt>
1588 <dd>
1589 <p>
1590 Suppress diff output.
1591 </p>
1592 </dd>
1593 </dl></div>
1594 </div>
1600 "Merge: " and the sha1s of ancestral commits are printed,
1601 separated by spaces. Note that the listed commits may not
1603 have limited your view of history: for example, if you are
1604 only interested in changes related to a certain directory or
1605 file.</p></div>
1608 config option to either another format name, or a
1611 built-in formats:</p></div>
1613 <li>
1614 <p>
1616 </p>
1620 </div></div>
1622 </li>
1623 <li>
1624 <p>
1626 </p>
1631 </div></div>
1635 </div></div>
1636 </li>
1637 <li>
1638 <p>
1640 </p>
1646 </div></div>
1650 </div></div>
1654 </div></div>
1655 </li>
1656 <li>
1657 <p>
1659 </p>
1665 </div></div>
1669 </div></div>
1673 </div></div>
1674 </li>
1675 <li>
1676 <p>
1678 </p>
1686 </div></div>
1690 </div></div>
1694 </div></div>
1695 </li>
1696 <li>
1697 <p>
1699 </p>
1706 </div></div>
1710 </div></div>
1711 </li>
1712 <li>
1713 <p>
1715 </p>
1717 stored in the commit object. Notably, the SHA1s are
1718 displayed in full, regardless of whether --abbrev or
1720 true parent commits, without taking grafts nor history
1721 simplification into account.</p></div>
1722 </li>
1723 <li>
1724 <p>
1726 </p>
1727 <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information
1728 you want to show. It works a little bit like printf format,
1731 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1732 would show something like this:</p></div>
1736 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
1737 </div></div>
1740 <li>
1741 <p>
1743 </p>
1744 </li>
1745 <li>
1746 <p>
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>
1777 <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>)
1778 </p>
1779 </li>
1780 <li>
1781 <p>
1783 </p>
1784 </li>
1785 <li>
1786 <p>
1787 <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>)
1788 </p>
1789 </li>
1790 <li>
1791 <p>
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>
1822 <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>)
1823 </p>
1824 </li>
1825 <li>
1826 <p>
1828 </p>
1829 </li>
1830 <li>
1831 <p>
1832 <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>)
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>
1918 </p>
1919 </li>
1920 <li>
1921 <p>
1923 </p>
1924 </li>
1925 <li>
1926 <p>
1928 </p>
1929 </li>
1930 <li>
1931 <p>
1933 </p>
1934 </li>
1935 <li>
1936 <p>
1938 </p>
1939 </li>
1940 <li>
1941 <p>
1943 </p>
1944 </li>
1945 <li>
1946 <p>
1948 </p>
1949 </li>
1950 <li>
1951 <p>
1953 </p>
1954 </li>
1955 <li>
1956 <p>
1957 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
1959 </p>
1960 </li>
1961 </ul></div>
1962 </li>
1963 </ul></div>
1965 <table><tr>
1968 </td>
1971 insert an empty string unless we are traversing reflog entries (e.g., by
1974 </tr></table>
1975 </div>
1976 <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
1977 is inserted immediately before the expansion if and only if the
1978 placeholder expands to a non-empty string.</p></div>
1979 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
1980 immediately precede the expansion are deleted if and only if the
1981 placeholder expands to an empty string.</p></div>
1983 is inserted immediately before the expansion if and only if the
1984 placeholder expands to a non-empty string.</p></div>
1986 <li>
1987 <p>
1989 </p>
1990 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
1992 other words, each commit has the message terminator character (usually a
1993 newline) appended, rather than a separator placed between entries.
1994 This means that the final entry of a single-line format will be properly
1995 terminated with a new line, just as the "oneline" format does.
1996 For example:</p></div>
2000 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
2001 4da45be
2002 7134973 -- NO NEWLINE
2005 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
2006 4da45be
2008 </div></div>
2009 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
2011 equivalent:</p></div>
2016 </div></div>
2017 </li>
2018 </ul></div>
2019 </div>
2024 -p
2025 </dt>
2027 -u
2028 </dt>
2030 --patch
2031 </dt>
2032 <dd>
2033 <p>
2034 Generate patch (see section on generating patches).
2036 </p>
2037 </dd>
2040 </dt>
2043 </dt>
2044 <dd>
2045 <p>
2047 the usual three.
2049 </p>
2050 </dd>
2052 --raw
2053 </dt>
2054 <dd>
2055 <p>
2056 Generate the raw format.
2058 </p>
2059 </dd>
2061 --patch-with-raw
2062 </dt>
2063 <dd>
2064 <p>
2066 </p>
2067 </dd>
2069 --patience
2070 </dt>
2071 <dd>
2072 <p>
2073 Generate a diff using the "patience diff" algorithm.
2074 </p>
2075 </dd>
2078 </dt>
2079 <dd>
2080 <p>
2081 Generate a diffstat. You can override the default
2083 The width of the filename part can be controlled by
2084 giving another width to it separated by a comma.
2088 </p>
2089 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
2090 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
2091 </dd>
2093 --numstat
2094 </dt>
2095 <dd>
2096 <p>
2098 deleted lines in decimal notation and pathname without
2099 abbreviation, to make it more machine friendly. For
2102 </p>
2103 </dd>
2105 --shortstat
2106 </dt>
2107 <dd>
2108 <p>
2110 number of modified files, as well as number of added and deleted
2111 lines.
2112 </p>
2113 </dd>
2116 </dt>
2117 <dd>
2118 <p>
2119 Output the distribution of relative amount of changes for each
2121 passing it a comma separated list of parameters.
2124 The following parameters are available:
2125 </p>
2129 </dt>
2130 <dd>
2131 <p>
2132 Compute the dirstat numbers by counting the lines that have been
2133 removed from the source, or added to the destination. This ignores
2134 the amount of pure code movements within a file. In other words,
2135 rearranging lines in a file is not counted as much as other changes.
2136 This is the default behavior when no parameter is given.
2137 </p>
2138 </dd>
2141 </dt>
2142 <dd>
2143 <p>
2144 Compute the dirstat numbers by doing the regular line-based diff
2145 analysis, and summing the removed/added line counts. (For binary
2146 files, count 64-byte chunks instead, since binary files have no
2149 lines within a file as much as other changes. The resulting output
2151 </p>
2152 </dd>
2155 </dt>
2156 <dd>
2157 <p>
2158 Compute the dirstat numbers by counting the number of files changed.
2159 Each changed file counts equally in the dirstat analysis. This is
2161 not have to look at the file contents at all.
2162 </p>
2163 </dd>
2166 </dt>
2167 <dd>
2168 <p>
2169 Count changes in a child directory for the parent directory as well.
2171 reported may exceed 100%. The default (non-cumulative) behavior can
2173 </p>
2174 </dd>
2177 </dt>
2178 <dd>
2179 <p>
2180 An integer parameter specifies a cut-off percent (3% by default).
2181 Directories contributing less than this percentage of the changes
2182 are not shown in the output.
2183 </p>
2184 </dd>
2185 </dl></div>
2187 directories with less than 10% of the total amount of changed files,
2188 and accumulating child directory counts in the parent directories:
2190 </dd>
2192 --summary
2193 </dt>
2194 <dd>
2195 <p>
2196 Output a condensed summary of extended header information
2197 such as creations, renames and mode changes.
2198 </p>
2199 </dd>
2201 --patch-with-stat
2202 </dt>
2203 <dd>
2204 <p>
2206 </p>
2207 </dd>
2209 -z
2210 </dt>
2211 <dd>
2212 <p>
2213 Separate the commits with NULs instead of with new newlines.
2214 </p>
2215 <div class="paragraph"><p>Also, when <tt>--raw</tt> or <tt>--numstat</tt> has been given, do not munge
2216 pathnames and use NULs as output field terminators.</p></div>
2217 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
2219 respectively, and the pathname will be enclosed in double quotes if
2220 any of those replacements occurred.</p></div>
2221 </dd>
2223 --name-only
2224 </dt>
2225 <dd>
2226 <p>
2227 Show only names of changed files.
2228 </p>
2229 </dd>
2231 --name-status
2232 </dt>
2233 <dd>
2234 <p>
2235 Show only names and status of changed files. See the description
2236 of the <tt>--diff-filter</tt> option on what the status letters mean.
2237 </p>
2238 </dd>
2240 --submodule[=<format>]
2241 </dt>
2242 <dd>
2243 <p>
2244 Chose the output format for submodule differences. <format> can be one of
2245 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
2246 is used when this option is not given. <em>log</em> is the default value for this
2247 option and lists the commits in that commit range like the <em>summary</em>
2249 </p>
2250 </dd>
2252 --color[=<when>]
2253 </dt>
2254 <dd>
2255 <p>
2256 Show colored diff.
2257 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
2258 The default value is <tt>never</tt>.
2259 </p>
2260 </dd>
2262 --no-color
2263 </dt>
2264 <dd>
2265 <p>
2266 Turn off colored diff.
2267 It is the same as <tt>--color=never</tt>.
2268 </p>
2269 </dd>
2271 --word-diff[=<mode>]
2272 </dt>
2273 <dd>
2274 <p>
2275 Show a word diff, using the <mode> to delimit changed words.
2276 By default, words are delimited by whitespace; see
2277 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
2278 must be one of:
2279 </p>
2282 color
2283 </dt>
2284 <dd>
2285 <p>
2286 Highlight changed words using only colors. Implies <tt>--color</tt>.
2287 </p>
2288 </dd>
2290 plain
2291 </dt>
2292 <dd>
2293 <p>
2294 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
2295 attempts to escape the delimiters if they appear in the input,
2296 so the output may be ambiguous.
2297 </p>
2298 </dd>
2300 porcelain
2301 </dt>
2302 <dd>
2303 <p>
2304 Use a special line-based format intended for script
2305 consumption. Added/removed/unchanged runs are printed in the
2306 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
2307 character at the beginning of the line and extending to the
2308 end of the line. Newlines in the input are represented by a
2309 tilde <tt>~</tt> on a line of its own.
2310 </p>
2311 </dd>
2313 none
2314 </dt>
2315 <dd>
2316 <p>
2317 Disable word diff again.
2318 </p>
2319 </dd>
2320 </dl></div>
2322 highlight the changed parts in all modes if enabled.</p></div>
2323 </dd>
2325 --word-diff-regex=<regex>
2326 </dt>
2327 <dd>
2328 <p>
2329 Use <regex> to decide what a word is, instead of considering
2330 runs of non-whitespace to be a word. Also implies
2331 <tt>--word-diff</tt> unless it was already enabled.
2332 </p>
2334 <regex> is considered a word. Anything between these matches is
2335 considered whitespace and ignored(!) for the purposes of finding
2336 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
2337 expression to make sure that it matches all non-whitespace characters.
2338 A match that contains a newline is silently truncated(!) at the
2339 newline.</p></div>
2340 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
2341 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
2342 overrides any diff driver or configuration setting. Diff drivers
2343 override configuration settings.</p></div>
2344 </dd>
2346 --color-words[=<regex>]
2347 </dt>
2348 <dd>
2349 <p>
2350 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
2351 specified) <tt>--word-diff-regex=<regex></tt>.
2352 </p>
2353 </dd>
2355 --no-renames
2356 </dt>
2357 <dd>
2358 <p>
2359 Turn off rename detection, even when the configuration
2360 file gives the default to do so.
2361 </p>
2362 </dd>
2364 --check
2365 </dt>
2366 <dd>
2367 <p>
2368 Warn if changes introduce whitespace errors. What are
2369 considered whitespace errors is controlled by <tt>core.whitespace</tt>
2370 configuration. By default, trailing whitespaces (including
2371 lines that solely consist of whitespaces) and a space character
2372 that is immediately followed by a tab character inside the
2373 initial indent of the line are considered whitespace errors.
2374 Exits with non-zero status if problems are found. Not compatible
2375 with --exit-code.
2376 </p>
2377 </dd>
2379 --full-index
2380 </dt>
2381 <dd>
2382 <p>
2383 Instead of the first handful of characters, show the full
2385 line when generating patch format output.
2386 </p>
2387 </dd>
2389 --binary
2390 </dt>
2391 <dd>
2392 <p>
2393 In addition to <tt>--full-index</tt>, output a binary diff that
2394 can be applied with <tt>git-apply</tt>.
2395 </p>
2396 </dd>
2398 --abbrev[=<n>]
2399 </dt>
2400 <dd>
2401 <p>
2402 Instead of showing the full 40-byte hexadecimal object
2403 name in diff-raw format output and diff-tree header
2404 lines, show only a partial prefix. This is
2405 independent of the <tt>--full-index</tt> option above, which controls
2406 the diff-patch output format. Non default number of
2407 digits can be specified with <tt>--abbrev=<n></tt>.
2408 </p>
2409 </dd>
2411 -B[<n>][/<m>]
2412 </dt>
2414 --break-rewrites[=[<n>][/<m>]]
2415 </dt>
2416 <dd>
2417 <p>
2418 Break complete rewrite changes into pairs of delete and
2419 create. This serves two purposes:
2420 </p>
2421 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
2422 not as a series of deletion and insertion mixed together with a very
2423 few lines that happen to match textually as the context, but as a
2424 single deletion of everything old followed by a single insertion of
2425 everything new, and the number <tt>m</tt> controls this aspect of the -B
2426 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
2427 original should remain in the result for git to consider it a total
2428 rewrite (i.e. otherwise the resulting patch will be a series of
2429 deletion and insertion mixed together with context lines).</p></div>
2430 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
2431 source of a rename (usually -M only considers a file that disappeared
2432 as the source of a rename), and the number <tt>n</tt> controls this aspect of
2433 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
2434 addition and deletion compared to 20% or more of the file’s size are
2435 eligible for being picked up as a possible source of a rename to
2436 another file.</p></div>
2437 </dd>
2439 -M[<n>]
2440 </dt>
2442 --find-renames[=<n>]
2443 </dt>
2444 <dd>
2445 <p>
2446 If generating diffs, detect and report renames for each commit.
2447 For following files across renames while traversing history, see
2448 <tt>--follow</tt>.
2449 If <tt>n</tt> is specified, it is a threshold on the similarity
2450 index (i.e. amount of addition/deletions compared to the
2451 file’s size). For example, <tt>-M90%</tt> means git should consider a
2452 delete/add pair to be a rename if more than 90% of the file
2453 hasn’t changed.
2454 </p>
2455 </dd>
2457 -C[<n>]
2458 </dt>
2460 --find-copies[=<n>]
2461 </dt>
2462 <dd>
2463 <p>
2464 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
2465 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
2466 </p>
2467 </dd>
2469 --find-copies-harder
2470 </dt>
2471 <dd>
2472 <p>
2473 For performance reasons, by default, <tt>-C</tt> option finds copies only
2474 if the original file of the copy was modified in the same
2475 changeset. This flag makes the command
2476 inspect unmodified files as candidates for the source of
2477 copy. This is a very expensive operation for large
2478 projects, so use it with caution. Giving more than one
2479 <tt>-C</tt> option has the same effect.
2480 </p>
2481 </dd>
2483 -D
2484 </dt>
2486 --irreversible-delete
2487 </dt>
2488 <dd>
2489 <p>
2490 Omit the preimage for deletes, i.e. print only the header but not
2491 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
2492 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
2493 solely for people who want to just concentrate on reviewing the
2494 text after the change. In addition, the output obviously lack
2495 enough information to apply such a patch in reverse, even manually,
2496 hence the name of the option.
2497 </p>
2498 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
2499 of a delete/create pair.</p></div>
2500 </dd>
2502 -l<num>
2503 </dt>
2504 <dd>
2505 <p>
2506 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
2507 is the number of potential rename/copy targets. This
2508 option prevents rename/copy detection from running if
2509 the number of rename/copy targets exceeds the specified
2510 number.
2511 </p>
2512 </dd>
2514 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
2515 </dt>
2516 <dd>
2517 <p>
2518 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
2519 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
2520 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
2521 are Unmerged (<tt>U</tt>), are
2522 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
2523 Any combination of the filter characters (including none) can be used.
2524 When <tt>*</tt> (All-or-none) is added to the combination, all
2525 paths are selected if there is any file that matches
2526 other criteria in the comparison; if there is no file
2527 that matches other criteria, nothing is selected.
2528 </p>
2529 </dd>
2531 -S<string>
2532 </dt>
2533 <dd>
2534 <p>
2535 Look for differences that introduce or remove an instance of
2536 <string>. Note that this is different than the string simply
2537 appearing in diff output; see the <em>pickaxe</em> entry in
2539 </p>
2540 </dd>
2542 -G<regex>
2543 </dt>
2544 <dd>
2545 <p>
2546 Look for differences whose added or removed line matches
2547 the given <regex>.
2548 </p>
2549 </dd>
2551 --pickaxe-all
2552 </dt>
2553 <dd>
2554 <p>
2555 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
2556 changeset, not just the files that contain the change
2557 in <string>.
2558 </p>
2559 </dd>
2561 --pickaxe-regex
2562 </dt>
2563 <dd>
2564 <p>
2565 Make the <string> not a plain string but an extended POSIX
2566 regex to match.
2567 </p>
2568 </dd>
2570 -O<orderfile>
2571 </dt>
2572 <dd>
2573 <p>
2574 Output the patch in the order specified in the
2575 <orderfile>, which has one shell glob pattern per line.
2576 </p>
2577 </dd>
2579 -R
2580 </dt>
2581 <dd>
2582 <p>
2583 Swap two inputs; that is, show differences from index or
2584 on-disk file to tree contents.
2585 </p>
2586 </dd>
2588 --relative[=<path>]
2589 </dt>
2590 <dd>
2591 <p>
2592 When run from a subdirectory of the project, it can be
2593 told to exclude changes outside the directory and show
2594 pathnames relative to it with this option. When you are
2595 not in a subdirectory (e.g. in a bare repository), you
2596 can name which subdirectory to make the output relative
2597 to by giving a <path> as an argument.
2598 </p>
2599 </dd>
2601 -a
2602 </dt>
2604 --text
2605 </dt>
2606 <dd>
2607 <p>
2608 Treat all files as text.
2609 </p>
2610 </dd>
2612 --ignore-space-at-eol
2613 </dt>
2614 <dd>
2615 <p>
2616 Ignore changes in whitespace at EOL.
2617 </p>
2618 </dd>
2620 -b
2621 </dt>
2623 --ignore-space-change
2624 </dt>
2625 <dd>
2626 <p>
2627 Ignore changes in amount of whitespace. This ignores whitespace
2628 at line end, and considers all other sequences of one or
2629 more whitespace characters to be equivalent.
2630 </p>
2631 </dd>
2633 -w
2634 </dt>
2636 --ignore-all-space
2637 </dt>
2638 <dd>
2639 <p>
2640 Ignore whitespace when comparing lines. This ignores
2641 differences even if one line has whitespace where the other
2642 line has none.
2643 </p>
2644 </dd>
2646 --inter-hunk-context=<lines>
2647 </dt>
2648 <dd>
2649 <p>
2650 Show the context between diff hunks, up to the specified number
2651 of lines, thereby fusing hunks that are close to each other.
2652 </p>
2653 </dd>
2655 --exit-code
2656 </dt>
2657 <dd>
2658 <p>
2659 Make the program exit with codes similar to diff(1).
2660 That is, it exits with 1 if there were differences and
2661 0 means no differences.
2662 </p>
2663 </dd>
2665 --quiet
2666 </dt>
2667 <dd>
2668 <p>
2669 Disable all output of the program. Implies <tt>--exit-code</tt>.
2670 </p>
2671 </dd>
2673 --ext-diff
2674 </dt>
2675 <dd>
2676 <p>
2677 Allow an external diff helper to be executed. If you set an
2680 </p>
2681 </dd>
2683 --no-ext-diff
2684 </dt>
2685 <dd>
2686 <p>
2687 Disallow external diff drivers.
2688 </p>
2689 </dd>
2691 --textconv
2692 </dt>
2694 --no-textconv
2695 </dt>
2696 <dd>
2697 <p>
2698 Allow (or disallow) external text conversion filters to be run
2700 details. Because textconv filters are typically a one-way
2701 conversion, the resulting diff is suitable for human
2702 consumption, but cannot be applied. For this reason, textconv
2704 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
2705 diff plumbing commands.
2706 </p>
2707 </dd>
2709 --ignore-submodules[=<when>]
2710 </dt>
2711 <dd>
2712 <p>
2713 Ignore changes to submodules in the diff generation. <when> can be
2716 untracked or modified files or its HEAD differs from the commit recorded
2717 in the superproject and can be used to override any settings of the
2718 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2720 contain untracked content (but they are still scanned for modified
2722 only changes to the commits stored in the superproject are shown (this was
2724 </p>
2725 </dd>
2727 --src-prefix=<prefix>
2728 </dt>
2729 <dd>
2730 <p>
2732 </p>
2733 </dd>
2735 --dst-prefix=<prefix>
2736 </dt>
2737 <dd>
2738 <p>
2740 </p>
2741 </dd>
2743 --no-prefix
2744 </dt>
2745 <dd>
2746 <p>
2747 Do not show any source or destination prefix.
2748 </p>
2749 </dd>
2750 </dl></div>
2753 </div>
2759 do not produce the output described above; instead they produce a
2760 patch file. You can customize the creation of such patches via the
2761 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
2762 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2763 diff format:</p></div>
2765 <li>
2766 <p>
2768 </p>
2771 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2772 </div></div>
2773 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2774 involved. Especially, even for a creation or a deletion,
2775 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2776 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
2777 name of the source file of the rename/copy and the name of
2778 the file that rename/copy produces, respectively.</p></div>
2779 </li>
2780 <li>
2781 <p>
2782 It is followed by one or more extended header lines:
2783 </p>
2786 <pre><tt>old mode <mode>
2787 new mode <mode>
2788 deleted file mode <mode>
2789 new file mode <mode>
2790 copy from <path>
2791 copy to <path>
2792 rename from <path>
2793 rename to <path>
2794 similarity index <number>
2795 dissimilarity index <number>
2796 index <hash>..<hash> <mode></tt></pre>
2797 </div></div>
2798 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2799 and file permission bits.</p></div>
2800 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
2802 the dissimilarity index is the percentage of changed lines. It
2803 is a rounded down integer, followed by a percent sign. The
2804 similarity index value of 100% is thus reserved for two equal
2805 files, while 100% dissimilarity means that no line from the old
2806 file made it into the new one.</p></div>
2807 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
2808 The <mode> is included if the file mode does not change; otherwise,
2809 separate lines indicate the old and the new mode.</p></div>
2810 </li>
2811 <li>
2812 <p>
2813 TAB, LF, double quote and backslash characters in pathnames
2815 If there is need for such substitution then the whole
2816 pathname is put in double quotes.
2817 </p>
2818 </li>
2819 <li>
2820 <p>
2823 It is incorrect to apply each change to each file sequentially. For
2824 example, this patch will swap a and b:
2825 </p>
2828 <pre><tt>diff --git a/a b/b
2829 rename from a
2830 rename to b
2831 diff --git a/b b/a
2832 rename from b
2833 rename to a</tt></pre>
2834 </div></div>
2835 </li>
2836 </ol></div>
2837 </div>
2840 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
2843 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
2844 of these commands to force generation of diffs with individual parents
2845 of a merge.</p></div>
2849 <pre><tt>diff --combined describe.c
2850 index fabadb8,cc95eb0..4866510
2851 --- a/describe.c
2852 +++ b/describe.c
2855 }
2857 - static void describe(char *arg)
2858 -static void describe(struct commit *cmit, int last_one)
2859 ++static void describe(char *arg, int last_one)
2860 {
2861 + unsigned char sha1[20];
2862 + struct commit *cmit;
2863 struct commit_list *list;
2864 static int initialized = 0;
2865 struct commit_name *n;
2868 + usage(describe_usage);
2869 + cmit = lookup_commit_reference(sha1);
2870 + if (!cmit)
2871 + usage(describe_usage);
2872 +
2873 if (!initialized) {
2874 initialized = 1;
2875 for_each_ref(get_name);</tt></pre>
2876 </div></div>
2878 <li>
2879 <p>
2880 It is preceded with a "git diff" header, that looks like
2882 </p>
2886 </div></div>
2891 </div></div>
2892 </li>
2893 <li>
2894 <p>
2895 It is followed by one or more extended header lines
2896 (this example shows a merge with two parents):
2897 </p>
2904 </div></div>
2905 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
2907 information about detected contents movement (renames and
2908 copying detection) are designed to work with diff of two
2910 </li>
2911 <li>
2912 <p>
2913 It is followed by two-line from-file/to-file header
2914 </p>
2917 <pre><tt>--- a/file
2918 +++ b/file</tt></pre>
2919 </div></div>
2922 files.</p></div>
2923 </li>
2924 <li>
2925 <p>
2926 Chunk header format is modified to prevent people from
2928 was created for review of merge commit changes, and was not
2929 meant for apply. The change is similar to the change in the
2931 </p>
2934 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
2935 </div></div>
2937 header for combined diff format.</p></div>
2938 </li>
2939 </ol></div>
2941 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
2943 compares two or more files file1, file2,… with one file X, and
2944 shows how X differs from each of fileN. One column for each of
2945 fileN is prepended to the output line to note how X’s line is
2946 different from it.</p></div>
2947 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
2949 in the column N means that the line appears in the result,
2950 and fileN does not have that line (in other words, the line was
2951 added, from the point of view of that parent).</p></div>
2955 in either file1 nor file2). Also eight other lines are the same
2957 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
2958 merge commit with the merge result (i.e. file1..fileN are the
2960 two unresolved merge parents with the working tree file
2963 </div>
2969 </dt>
2970 <dd>
2971 <p>
2972 Show the whole commit history, but skip any merges
2973 </p>
2974 </dd>
2977 </dt>
2978 <dd>
2979 <p>
2981 in the include/scsi or drivers/scsi subdirectories
2982 </p>
2983 </dd>
2986 </dt>
2987 <dd>
2988 <p>
2992 </p>
2993 </dd>
2996 </dt>
2997 <dd>
2998 <p>
2999 Show the commits that are in the "test" branch but not yet
3000 in the "release" branch, along with the list of paths
3001 each commit modifies.
3002 </p>
3003 </dd>
3006 </dt>
3007 <dd>
3008 <p>
3009 Shows the commits that changed builtin-rev-list.c, including
3010 those commits that occurred before the file was given its
3011 present name.
3012 </p>
3013 </dd>
3016 </dt>
3017 <dd>
3018 <p>
3019 Shows all commits that are in any of local branches but not in
3021 origin doesn’t).
3022 </p>
3023 </dd>
3026 </dt>
3027 <dd>
3028 <p>
3029 Shows all commits that are in local master but not in any remote
3030 repository master branches.
3031 </p>
3032 </dd>
3035 </dt>
3036 <dd>
3037 <p>
3038 Shows the history including change diffs, but only from the
3039 "main branch" perspective, skipping commits that come from merged
3040 branches, and showing full diffs of changes introduced by the merges.
3041 This makes sense only when following a strict policy of merging all
3042 topic branches when staying on a single integration branch.
3043 </p>
3044 </dd>
3045 </dl></div>
3046 </div>
3051 <li>
3052 <p>
3053 The pathnames recorded in the index and in the tree objects
3054 are treated as uninterpreted sequences of non-NUL bytes.
3055 What readdir(2) returns are what are recorded and compared
3056 with the data git keeps track of, which in turn are expected
3058 thing as pathname encoding translation.
3059 </p>
3060 </li>
3061 <li>
3062 <p>
3063 The contents of the blob objects are uninterpreted sequences
3064 of bytes. There is no encoding translation at the core
3065 level.
3066 </p>
3067 </li>
3068 <li>
3069 <p>
3070 The commit log messages are uninterpreted sequences of non-NUL
3071 bytes.
3072 </p>
3073 </li>
3074 </ul></div>
3076 in UTF-8, both the core and git Porcelain are designed not to
3077 force UTF-8 on projects. If all participants of a particular
3078 project find it more convenient to use legacy encodings, git
3079 does not forbid it. However, there are a few things to keep in
3080 mind.</p></div>
3082 <li>
3083 <p>
3085 a warning if the commit log message given to it does not look
3086 like a valid UTF-8 string, unless you explicitly say your
3087 project uses a legacy encoding. The way to say this is to
3089 </p>
3092 <pre><tt>[i18n]
3094 </div></div>
3097 help other people who look at them later. Lack of this header
3099 </li>
3100 <li>
3101 <p>
3104 log message into UTF-8 unless otherwise specified. You can
3105 specify the desired output encoding with
3107 </p>
3110 <pre><tt>[i18n]
3112 </div></div>
3115 </li>
3116 </ol></div>
3118 message when a commit is made to force UTF-8 at the commit
3119 object level, because re-coding to UTF-8 is not necessarily a
3120 reversible operation.</p></div>
3121 </div>
3124 <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>
3125 for settings related to diff generation.</p></div>
3128 format.pretty
3129 </dt>
3130 <dd>
3131 <p>
3133 Defaults to "medium".
3134 </p>
3135 </dd>
3137 i18n.logOutputEncoding
3138 </dt>
3139 <dd>
3140 <p>
3141 Encoding to use when displaying logs. (See "Discussion", above.)
3143 otherwise.
3144 </p>
3145 </dd>
3147 log.date
3148 </dt>
3149 <dd>
3150 <p>
3151 Default format for human-readable dates. (Compare the
3154 </p>
3155 </dd>
3157 log.showroot
3158 </dt>
3159 <dd>
3160 <p>
3162 initial commit as a big creation event. Any root commits in
3165 </p>
3166 </dd>
3168 mailmap.file
3169 </dt>
3170 <dd>
3171 <p>
3173 </p>
3174 </dd>
3176 notes.displayRef
3177 </dt>
3178 <dd>
3179 <p>
3184 </p>
3186 multiple times. A warning will be issued for refs that do not exist,
3187 but a glob that does not match any refs is silently ignored.</p></div>
3191 </dd>
3192 </dl></div>
3193 </div>
3197 </div>
3201 </div>
3202 </div>
3203 </body>
3204 </html>