| blob | 94c1b0714908d6179d3305f76f85a6732eb2b8e8 |
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 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-log(1) Manual Page
574 </h1>
577 <p>git-log -
578 Show commit logs
579 </p>
580 </div>
581 </div>
586 <div class="verseblock-content"><em>git log</em> [<options>] [<since>..<until>] [[--] <path>…]</div>
588 </div></div>
589 </div>
594 command to control what is shown and how, and options applicable to
596 each commit introduces are shown.</p></div>
597 </div>
603 </dt>
604 <dd>
605 <p>
606 Limits the number of commits to show.
607 Note that this is a commit limiting option, see below.
608 </p>
609 </dd>
612 </dt>
613 <dd>
614 <p>
615 Show only commits between the named two commits. When
620 </p>
621 </dd>
623 --follow
624 </dt>
625 <dd>
626 <p>
627 Continue listing the history of a file beyond renames
628 (works only for a single file).
629 </p>
630 </dd>
632 --no-decorate
633 </dt>
635 --decorate[=short|full|no]
636 </dt>
637 <dd>
638 <p>
642 full ref name (including prefix) will be printed. The default option
644 </p>
645 </dd>
647 --source
648 </dt>
649 <dd>
650 <p>
651 Print out the ref name given on the command line by which each
652 commit was reached.
653 </p>
654 </dd>
656 --full-diff
657 </dt>
658 <dd>
659 <p>
660 Without this flag, "git log -p <path>…" shows commits that
661 touch the specified paths, and diffs about the same specified
662 paths. With this, the full diff is shown for commits that touch
663 the specified paths; this means that "<path>…" limits only
664 commits, and doesn’t limit diff for those commits.
665 </p>
667 produced by --stat etc.</p></div>
668 </dd>
670 --log-size
671 </dt>
672 <dd>
673 <p>
674 Before the log message print out its size in bytes. Intended
675 mainly for porcelain tools consumption. If git is unable to
676 produce a valid value size is set to zero.
677 Note that only message is considered, if also a diff is shown
678 its size is not included.
679 </p>
680 </dd>
683 </dt>
684 <dd>
685 <p>
686 Show only commits that are enough to explain how the files
687 that match the specified paths came to be. See "History
688 Simplification" below for details and other simplification
689 modes.
690 </p>
693 </dd>
694 </dl></div>
697 special notations explained in the description, additional commit
698 limiting may be applied. Note that they are applied before commit
703 </dt>
706 </dt>
707 <dd>
708 <p>
709 Limit the number of commits to output.
710 </p>
711 </dd>
714 </dt>
715 <dd>
716 <p>
718 </p>
719 </dd>
722 </dt>
725 </dt>
726 <dd>
727 <p>
728 Show commits more recent than a specific date.
729 </p>
730 </dd>
733 </dt>
736 </dt>
737 <dd>
738 <p>
739 Show commits older than a specific date.
740 </p>
741 </dd>
744 </dt>
747 </dt>
748 <dd>
749 <p>
750 Limit the commits output to ones with author/committer
751 header lines that match the specified pattern (regular expression).
752 </p>
753 </dd>
756 </dt>
757 <dd>
758 <p>
759 Limit the commits output to ones with log message that
760 matches the specified pattern (regular expression).
761 </p>
762 </dd>
764 --all-match
765 </dt>
766 <dd>
767 <p>
768 Limit the commits output to ones that match all given --grep,
769 --author and --committer instead of ones that match at least one.
770 </p>
771 </dd>
773 -i
774 </dt>
776 --regexp-ignore-case
777 </dt>
778 <dd>
779 <p>
780 Match the regexp limiting patterns without regard to letters case.
781 </p>
782 </dd>
784 -E
785 </dt>
787 --extended-regexp
788 </dt>
789 <dd>
790 <p>
791 Consider the limiting patterns to be extended regular expressions
792 instead of the default basic regular expressions.
793 </p>
794 </dd>
796 -F
797 </dt>
799 --fixed-strings
800 </dt>
801 <dd>
802 <p>
803 Consider the limiting patterns to be fixed strings (don’t interpret
804 pattern as a regular expression).
805 </p>
806 </dd>
808 --remove-empty
809 </dt>
810 <dd>
811 <p>
812 Stop when a given path disappears from the tree.
813 </p>
814 </dd>
816 --merges
817 </dt>
818 <dd>
819 <p>
821 </p>
822 </dd>
824 --no-merges
825 </dt>
826 <dd>
827 <p>
828 Do not print commits with more than one parent. This is
830 </p>
831 </dd>
834 </dt>
837 </dt>
839 --no-min-parents
840 </dt>
842 --no-max-parents
843 </dt>
844 <dd>
845 <p>
846 Show only commits which have at least (or at most) that many
850 </p>
851 <div class="paragraph"><p><tt>--no-min-parents</tt> and <tt>--no-max-parents</tt> reset these limits (to no limit)
854 </dd>
856 --first-parent
857 </dt>
858 <dd>
859 <p>
860 Follow only the first parent commit upon seeing a merge
861 commit. This option can give a better overview when
862 viewing the evolution of a particular topic branch,
863 because merges into a topic branch tend to be only about
864 adjusting to updated upstream from time to time, and
865 this option allows you to ignore the individual commits
866 brought in to your history by such a merge.
867 </p>
868 </dd>
870 --not
871 </dt>
872 <dd>
873 <p>
876 </p>
877 </dd>
879 --all
880 </dt>
881 <dd>
882 <p>
885 </p>
886 </dd>
889 </dt>
890 <dd>
891 <p>
896 </p>
897 </dd>
900 </dt>
901 <dd>
902 <p>
907 </p>
908 </dd>
911 </dt>
912 <dd>
913 <p>
916 remote-tracking branches to ones matching given shell glob.
917 If pattern lacks <em>?</em>, <em><strong></em>, or <em>[</em>, <em>/</strong></em> at the end is implied.
918 </p>
919 </dd>
922 </dt>
923 <dd>
924 <p>
929 </p>
930 </dd>
932 --ignore-missing
933 </dt>
934 <dd>
935 <p>
936 Upon seeing an invalid object name in the input, pretend as if
937 the bad input was not given.
938 </p>
939 </dd>
941 --bisect
942 </dt>
943 <dd>
944 <p>
948 line.
949 </p>
950 </dd>
952 --stdin
953 </dt>
954 <dd>
955 <p>
958 seen, stop reading commits and start reading paths to limit the
959 result.
960 </p>
961 </dd>
963 --cherry-mark
964 </dt>
965 <dd>
966 <p>
969 </p>
970 </dd>
972 --cherry-pick
973 </dt>
974 <dd>
975 <p>
976 Omit any commit that introduces the same change as
977 another commit on the "other side" when the set of
978 commits are limited with symmetric difference.
979 </p>
980 <div class="paragraph"><p>For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way
981 to list all commits on only one side of them is with
984 from the other branch (for example, "3rd on b" may be cherry-picked
985 from branch A). With this option, such pairs of commits are
986 excluded from the output.</p></div>
987 </dd>
989 --left-only
990 </dt>
992 --right-only
993 </dt>
994 <dd>
995 <p>
996 List only commits on the respective side of a symmetric range,
999 </p>
1000 <div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A…B</tt> omits those
1002 <tt>A</tt>. In other words, this lists the <tt>+</tt> commits from <tt>git cherry A B</tt>.
1004 list.</p></div>
1005 </dd>
1007 --cherry
1008 </dt>
1009 <dd>
1010 <p>
1012 limit the output to the commits on our side and mark those that
1013 have been applied to the other side of a forked history with
1016 </p>
1017 </dd>
1019 -g
1020 </dt>
1022 --walk-reflogs
1023 </dt>
1024 <dd>
1025 <p>
1026 Instead of walking the commit ancestry chain, walk
1027 reflog entries from the most recent one to older ones.
1028 When this option is used you cannot specify commits to
1031 </p>
1032 <div class="paragraph"><p>With <em>--pretty</em> format other than oneline (for obvious reasons),
1033 this causes the output to have two extra lines of information
1035 used in the output. When the starting commit is specified as
1038 prefixed with this information on the same line.
1041 </dd>
1043 --merge
1044 </dt>
1045 <dd>
1046 <p>
1047 After a failed merge, show refs that touch files having a
1048 conflict and don’t exist on all heads to merge.
1049 </p>
1050 </dd>
1052 --boundary
1053 </dt>
1054 <dd>
1055 <p>
1056 Output uninteresting commits at the boundary, which are usually
1057 not shown.
1058 </p>
1059 </dd>
1060 </dl></div>
1062 <div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the
1065 is how to do it, as there are various strategies to simplify the history.</p></div>
1070 </dt>
1071 <dd>
1072 <p>
1074 </p>
1075 </dd>
1077 --simplify-by-decoration
1078 </dt>
1079 <dd>
1080 <p>
1081 Commits that are referred by some branch or tag are selected.
1082 </p>
1083 </dd>
1084 </dl></div>
1085 <div class="paragraph"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
1086 <div class="paragraph"><p>The following options affect the way the simplification is performed:</p></div>
1089 Default mode
1090 </dt>
1091 <dd>
1092 <p>
1093 Simplifies the history to the simplest history explaining the
1094 final state of the tree. Simplest because it prunes some side
1095 branches if the end result is the same (i.e. merging branches
1096 with the same content)
1097 </p>
1098 </dd>
1100 --full-history
1101 </dt>
1102 <dd>
1103 <p>
1104 Same as the default mode, but does not prune some history.
1105 </p>
1106 </dd>
1108 --dense
1109 </dt>
1110 <dd>
1111 <p>
1112 Only the selected commits are shown, plus some to have a
1113 meaningful history.
1114 </p>
1115 </dd>
1117 --sparse
1118 </dt>
1119 <dd>
1120 <p>
1121 All commits in the simplified history are shown.
1122 </p>
1123 </dd>
1125 --simplify-merges
1126 </dt>
1127 <dd>
1128 <p>
1130 merges from the resulting history, as there are no selected
1131 commits contributing to this merge.
1132 </p>
1133 </dd>
1135 --ancestry-path
1136 </dt>
1137 <dd>
1138 <p>
1144 </p>
1145 </dd>
1146 </dl></div>
1148 <div class="paragraph"><p>Suppose you specified <tt>foo</tt> as the <paths>. We shall call commits
1151 <div class="paragraph"><p>In the following, we will always refer to the same example history to
1152 illustrate the differences between simplification settings. We assume
1156 <pre><tt> .-A---M---N---O---P
1157 / / / / /
1158 I B C D E
1159 \ / / / /
1160 `-------------'</tt></pre>
1161 </div></div>
1162 <div class="paragraph"><p>The horizontal line of history A---P is taken to be the first parent of
1163 each merge. The commits are:</p></div>
1165 <li>
1166 <p>
1170 </p>
1171 </li>
1172 <li>
1173 <p>
1175 </p>
1176 </li>
1177 <li>
1178 <p>
1180 hence TREESAME to all parents.
1181 </p>
1182 </li>
1183 <li>
1184 <p>
1186 so it is not TREESAME to any parent.
1187 </p>
1188 </li>
1189 <li>
1190 <p>
1193 </p>
1194 </li>
1195 <li>
1196 <p>
1199 TREESAME to all parents.
1200 </p>
1201 </li>
1202 </ul></div>
1203 <div class="paragraph"><p><em>rev-list</em> walks backwards through history, including or excluding
1206 are available.</p></div>
1209 Default mode
1210 </dt>
1211 <dd>
1212 <p>
1213 Commits are included if they are not TREESAME to any parent
1215 commit was a merge, and it was TREESAME to one parent, follow
1216 only that parent. (Even if there are several TREESAME
1217 parents, follow only one of them.) Otherwise, follow all
1218 parents.
1219 </p>
1223 <pre><tt> .-A---N---O
1224 / / /
1225 I---------D</tt></pre>
1226 </div></div>
1231 <div class="paragraph"><p>Parent/child relations are only visible with --parents, but that does
1232 not affect the commits selected in default mode, so we have shown the
1233 parent lines.</p></div>
1234 </dd>
1236 --full-history without parent rewriting
1237 </dt>
1238 <dd>
1239 <p>
1240 This mode differs from the default in one point: always follow
1241 all parents of a merge, even if it is TREESAME to one of them.
1242 Even if more than one side of the merge has commits that are
1243 included, this does not imply that the merge itself is! In
1244 the example, we get
1245 </p>
1249 </div></div>
1250 <div class="paragraph"><p><tt>P</tt> and <tt>M</tt> were excluded because they are TREESAME to a parent. <tt>E</tt>,
1252 do not appear.</p></div>
1253 <div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk
1254 about the parent/child relationships between the commits, so we show
1255 them disconnected.</p></div>
1256 </dd>
1258 --full-history with parent rewriting
1259 </dt>
1260 <dd>
1261 <p>
1262 Ordinary commits are only included if they are !TREESAME
1264 </p>
1266 Along each parent, prune away commits that are not included
1267 themselves. This results in</p></div>
1270 <pre><tt> .-A---M---N---O---P
1271 / / / / /
1272 I B / D /
1273 \ / / / /
1274 `-------------'</tt></pre>
1275 </div></div>
1276 <div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt>
1277 was pruned away because it is TREESAME, but the parent list of P was
1280 </dd>
1281 </dl></div>
1283 affects inclusion:</p></div>
1286 --dense
1287 </dt>
1288 <dd>
1289 <p>
1290 Commits that are walked are included if they are not TREESAME
1291 to any parent.
1292 </p>
1293 </dd>
1295 --sparse
1296 </dt>
1297 <dd>
1298 <p>
1299 All commits that are walked are included.
1300 </p>
1301 <div class="paragraph"><p>Note that without <em>--full-history</em>, this still simplifies merges: if
1302 one of the parents is TREESAME, we follow only that one, so the other
1303 sides of the merge are never walked.</p></div>
1304 </dd>
1306 --simplify-merges
1307 </dt>
1308 <dd>
1309 <p>
1310 First, build a history graph in the same way that
1312 </p>
1313 <div class="paragraph"><p>Then simplify each commit ‘C` to its replacement <tt>C’</tt> in the final
1314 history according to the following rules:</p></div>
1316 <li>
1317 <p>
1319 </p>
1320 </li>
1321 <li>
1322 <p>
1323 Replace each parent ‘P` of <tt>C’</tt> with its simplification ‘P’`. In
1324 the process, drop parents that are ancestors of other parents, and
1325 remove duplicates.
1326 </p>
1327 </li>
1328 <li>
1329 <p>
1332 Otherwise, it is replaced with its only parent.
1333 </p>
1334 </li>
1335 </ul></div>
1340 <pre><tt> .-A---M---N---O
1341 / / /
1342 I B D
1343 \ / /
1344 `---------'</tt></pre>
1345 </div></div>
1346 <div class="paragraph"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div>
1348 <li>
1349 <p>
1352 </p>
1353 </li>
1354 <li>
1355 <p>
1357 removed completely, because it had one parent and is TREESAME.
1358 </p>
1359 </li>
1360 </ul></div>
1361 </dd>
1362 </dl></div>
1366 --ancestry-path
1367 </dt>
1368 <dd>
1369 <p>
1370 Limit the displayed commits to those directly on the ancestry
1372 range. I.e. only display commits that are ancestor of the "to"
1373 commit, and descendants of the "from" commit.
1374 </p>
1375 <div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
1378 <pre><tt> D---E-------F
1379 / \ \
1380 B---C---G---H---I---J
1381 / \
1382 A-------K---------------L--M</tt></pre>
1383 </div></div>
1384 <div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <tt>M</tt>,
1387 that "what does <tt>M</tt> have that did not exist in <tt>D</tt>". The result in this
1389 of course).</p></div>
1390 <div class="paragraph"><p>When we want to find out what commits in <tt>M</tt> are contaminated with the
1397 <pre><tt> E-------F
1398 \ \
1399 G---H---I---J
1400 \
1401 L--M</tt></pre>
1402 </div></div>
1403 </dd>
1404 </dl></div>
1405 <div class="paragraph"><p>The <em>--simplify-by-decoration</em> option allows you to view only the
1406 big picture of the topology of the history, by omitting commits
1407 that are not referenced by tags. Commits are marked as !TREESAME
1408 (in other words, kept after history simplification rules described
1410 contents of the paths given on the command line. All other
1411 commits are marked as TREESAME (subject to be simplified away).</p></div>
1413 <div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>
1416 --topo-order
1417 </dt>
1418 <dd>
1419 <p>
1420 This option makes them appear in topological order (i.e.
1421 descendant commits are shown before their parents).
1422 </p>
1423 </dd>
1425 --date-order
1426 </dt>
1427 <dd>
1428 <p>
1430 parent comes before all of its children, but otherwise things
1431 are still ordered in the commit timestamp order.
1432 </p>
1433 </dd>
1435 --reverse
1436 </dt>
1437 <dd>
1438 <p>
1439 Output the commits in reverse order.
1441 </p>
1442 </dd>
1443 </dl></div>
1445 <div class="paragraph"><p>These options are mostly targeted for packing of git repositories.</p></div>
1448 --objects
1449 </dt>
1450 <dd>
1451 <p>
1452 Print the object IDs of any object referenced by the listed
1454 all object IDs which I need to download if I have the commit
1455 object <em>bar</em>, but not <em>foo</em>".
1456 </p>
1457 </dd>
1459 --objects-edge
1460 </dt>
1461 <dd>
1462 <p>
1464 commits prefixed with a "-" character. This is used by
1466 objects in deltified form based on objects contained in these
1467 excluded commits to reduce network traffic.
1468 </p>
1469 </dd>
1471 --unpacked
1472 </dt>
1473 <dd>
1474 <p>
1476 in packs.
1477 </p>
1478 </dd>
1480 --no-walk
1481 </dt>
1482 <dd>
1483 <p>
1484 Only show the given revs, but do not traverse their ancestors.
1485 </p>
1486 </dd>
1488 --do-walk
1489 </dt>
1490 <dd>
1491 <p>
1492 Overrides a previous --no-walk.
1493 </p>
1494 </dd>
1495 </dl></div>
1500 </dt>
1503 </dt>
1504 <dd>
1505 <p>
1506 Pretty-print the contents of the commit logs in a given format,
1508 <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See
1509 the "PRETTY FORMATS" section for some additional details for each
1511 </p>
1514 </dd>
1516 --abbrev-commit
1517 </dt>
1518 <dd>
1519 <p>
1520 Instead of showing the full 40-byte hexadecimal commit object
1521 name, show only a partial prefix. Non default number of
1522 digits can be specified with "--abbrev=<n>" (which also modifies
1523 diff output, if it is displayed).
1524 </p>
1527 </dd>
1529 --no-abbrev-commit
1530 </dt>
1531 <dd>
1532 <p>
1533 Show the full 40-byte hexadecimal commit object name. This negates
1536 </p>
1537 </dd>
1539 --oneline
1540 </dt>
1541 <dd>
1542 <p>
1543 This is a shorthand for "--pretty=oneline --abbrev-commit"
1544 used together.
1545 </p>
1546 </dd>
1549 </dt>
1550 <dd>
1551 <p>
1552 The commit objects record the encoding used for the log message
1553 in their encoding header; this option can be used to tell the
1554 command to re-code the commit log message in the encoding
1555 preferred by the user. For non plumbing commands this
1556 defaults to UTF-8.
1557 </p>
1558 </dd>
1561 </dt>
1562 <dd>
1563 <p>
1565 commit, when showing the commit log message. This is the default
1568 on the command line.
1569 </p>
1572 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
1573 <div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the
1575 is not qualified.</p></div>
1577 being displayed. Examples: "--notes=foo" will show only notes from
1580 </dd>
1582 --no-notes
1583 </dt>
1584 <dd>
1585 <p>
1587 resetting the list of notes refs from which notes are shown.
1588 Options are parsed in the order given on the command line, so e.g.
1589 "--notes --notes=foo --no-notes --notes=bar" will only show notes
1590 from "refs/notes/bar".
1591 </p>
1592 </dd>
1595 </dt>
1597 --[no-]standard-notes
1598 </dt>
1599 <dd>
1600 <p>
1601 These options are deprecated. Use the above --notes/--no-notes
1602 options instead.
1603 </p>
1604 </dd>
1606 --relative-date
1607 </dt>
1608 <dd>
1609 <p>
1611 </p>
1612 </dd>
1614 --date=(relative|local|default|iso|rfc|short|raw)
1615 </dt>
1616 <dd>
1617 <p>
1618 Only takes effect for dates shown in human-readable format, such
1620 value for log command’s --date option.
1621 </p>
1624 <div class="paragraph"><p><tt>--date=local</tt> shows timestamps in user’s local timezone.</p></div>
1625 <div class="paragraph"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div>
1626 <div class="paragraph"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822
1627 format, often found in E-mail messages.</p></div>
1628 <div class="paragraph"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div>
1629 <div class="paragraph"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div>
1632 </dd>
1634 --parents
1635 </dt>
1636 <dd>
1637 <p>
1638 Print also the parents of the commit (in the form "commit parent…").
1640 </p>
1641 </dd>
1643 --children
1644 </dt>
1645 <dd>
1646 <p>
1647 Print also the children of the commit (in the form "commit child…").
1649 </p>
1650 </dd>
1652 --left-right
1653 </dt>
1654 <dd>
1655 <p>
1656 Mark which side of a symmetric diff a commit is reachable from.
1660 </p>
1664 <pre><tt> y---b---b branch B
1665 / \ /
1666 / .
1667 / / \
1668 o---x---a---a branch A</tt></pre>
1669 </div></div>
1673 <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B
1679 -yyyyyyy... 1st on b
1681 </div></div>
1682 </dd>
1684 --graph
1685 </dt>
1686 <dd>
1687 <p>
1688 Draw a text-based graphical representation of the commit history
1689 on the left hand side of the output. This may cause extra lines
1690 to be printed in between commits, in order for the graph history
1691 to be drawn properly.
1692 </p>
1693 <div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>
1696 </dd>
1697 </dl></div>
1700 Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
1701 options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
1704 -c
1705 </dt>
1706 <dd>
1707 <p>
1708 With this option, diff output for a merge commit
1709 shows the differences from each of the parents to the merge result
1710 simultaneously instead of showing pairwise diff between a parent
1711 and the result one at a time. Furthermore, it lists only files
1712 which were modified from all parents.
1713 </p>
1714 </dd>
1716 --cc
1717 </dt>
1718 <dd>
1719 <p>
1721 patch output by omitting uninteresting hunks whose contents in
1722 the parents have only two variants and the merge result picks
1723 one of them without modification.
1724 </p>
1725 </dd>
1727 -m
1728 </dt>
1729 <dd>
1730 <p>
1731 This flag makes the merge commits show the full diff like
1732 regular commits; for each merge parent, a separate log entry
1733 and diff is generated. An exception is that only diff against
1735 in that case, the output represents the changes the merge
1737 </p>
1738 </dd>
1740 -r
1741 </dt>
1742 <dd>
1743 <p>
1744 Show recursive diffs.
1745 </p>
1746 </dd>
1748 -t
1749 </dt>
1750 <dd>
1751 <p>
1753 </p>
1754 </dd>
1756 -s
1757 </dt>
1758 <dd>
1759 <p>
1760 Suppress diff output.
1761 </p>
1762 </dd>
1763 </dl></div>
1764 </div>
1770 "Merge: " and the sha1s of ancestral commits are printed,
1771 separated by spaces. Note that the listed commits may not
1773 have limited your view of history: for example, if you are
1774 only interested in changes related to a certain directory or
1775 file.</p></div>
1778 config option to either another format name, or a
1781 built-in formats:</p></div>
1783 <li>
1784 <p>
1786 </p>
1790 </div></div>
1792 </li>
1793 <li>
1794 <p>
1796 </p>
1801 </div></div>
1805 </div></div>
1806 </li>
1807 <li>
1808 <p>
1810 </p>
1816 </div></div>
1820 </div></div>
1824 </div></div>
1825 </li>
1826 <li>
1827 <p>
1829 </p>
1835 </div></div>
1839 </div></div>
1843 </div></div>
1844 </li>
1845 <li>
1846 <p>
1848 </p>
1856 </div></div>
1860 </div></div>
1864 </div></div>
1865 </li>
1866 <li>
1867 <p>
1869 </p>
1876 </div></div>
1880 </div></div>
1881 </li>
1882 <li>
1883 <p>
1885 </p>
1887 stored in the commit object. Notably, the SHA1s are
1888 displayed in full, regardless of whether --abbrev or
1890 true parent commits, without taking grafts nor history
1891 simplification into account.</p></div>
1892 </li>
1893 <li>
1894 <p>
1896 </p>
1897 <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information
1898 you want to show. It works a little bit like printf format,
1901 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
1902 would show something like this:</p></div>
1906 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
1907 </div></div>
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>
1947 <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>)
1948 </p>
1949 </li>
1950 <li>
1951 <p>
1953 </p>
1954 </li>
1955 <li>
1956 <p>
1957 <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>)
1958 </p>
1959 </li>
1960 <li>
1961 <p>
1963 </p>
1964 </li>
1965 <li>
1966 <p>
1968 </p>
1969 </li>
1970 <li>
1971 <p>
1973 </p>
1974 </li>
1975 <li>
1976 <p>
1978 </p>
1979 </li>
1980 <li>
1981 <p>
1983 </p>
1984 </li>
1985 <li>
1986 <p>
1988 </p>
1989 </li>
1990 <li>
1991 <p>
1992 <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>)
1993 </p>
1994 </li>
1995 <li>
1996 <p>
1998 </p>
1999 </li>
2000 <li>
2001 <p>
2002 <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>)
2003 </p>
2004 </li>
2005 <li>
2006 <p>
2008 </p>
2009 </li>
2010 <li>
2011 <p>
2013 </p>
2014 </li>
2015 <li>
2016 <p>
2018 </p>
2019 </li>
2020 <li>
2021 <p>
2023 </p>
2024 </li>
2025 <li>
2026 <p>
2028 </p>
2029 </li>
2030 <li>
2031 <p>
2033 </p>
2034 </li>
2035 <li>
2036 <p>
2038 </p>
2039 </li>
2040 <li>
2041 <p>
2043 </p>
2044 </li>
2045 <li>
2046 <p>
2048 </p>
2049 </li>
2050 <li>
2051 <p>
2053 </p>
2054 </li>
2055 <li>
2056 <p>
2058 </p>
2059 </li>
2060 <li>
2061 <p>
2063 </p>
2064 </li>
2065 <li>
2066 <p>
2068 </p>
2069 </li>
2070 <li>
2071 <p>
2073 </p>
2074 </li>
2075 <li>
2076 <p>
2078 </p>
2079 </li>
2080 <li>
2081 <p>
2083 </p>
2084 </li>
2085 <li>
2086 <p>
2088 </p>
2089 </li>
2090 <li>
2091 <p>
2093 </p>
2094 </li>
2095 <li>
2096 <p>
2098 </p>
2099 </li>
2100 <li>
2101 <p>
2103 </p>
2104 </li>
2105 <li>
2106 <p>
2108 </p>
2109 </li>
2110 <li>
2111 <p>
2113 </p>
2114 </li>
2115 <li>
2116 <p>
2118 </p>
2119 </li>
2120 <li>
2121 <p>
2123 </p>
2124 </li>
2125 <li>
2126 <p>
2127 <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of
2129 </p>
2130 </li>
2131 </ul></div>
2132 </li>
2133 </ul></div>
2135 <table><tr>
2138 </td>
2141 insert an empty string unless we are traversing reflog entries (e.g., by
2144 </tr></table>
2145 </div>
2146 <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
2147 is inserted immediately before the expansion if and only if the
2148 placeholder expands to a non-empty string.</p></div>
2149 <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
2150 immediately precede the expansion are deleted if and only if the
2151 placeholder expands to an empty string.</p></div>
2153 is inserted immediately before the expansion if and only if the
2154 placeholder expands to a non-empty string.</p></div>
2156 <li>
2157 <p>
2159 </p>
2160 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
2162 other words, each commit has the message terminator character (usually a
2163 newline) appended, rather than a separator placed between entries.
2164 This means that the final entry of a single-line format will be properly
2165 terminated with a new line, just as the "oneline" format does.
2166 For example:</p></div>
2170 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
2171 4da45be
2172 7134973 -- NO NEWLINE
2175 | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
2176 4da45be
2178 </div></div>
2179 <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
2181 equivalent:</p></div>
2186 </div></div>
2187 </li>
2188 </ul></div>
2189 </div>
2194 -p
2195 </dt>
2197 -u
2198 </dt>
2200 --patch
2201 </dt>
2202 <dd>
2203 <p>
2204 Generate patch (see section on generating patches).
2206 </p>
2207 </dd>
2210 </dt>
2213 </dt>
2214 <dd>
2215 <p>
2217 the usual three.
2219 </p>
2220 </dd>
2222 --raw
2223 </dt>
2224 <dd>
2225 <p>
2226 Generate the raw format.
2228 </p>
2229 </dd>
2231 --patch-with-raw
2232 </dt>
2233 <dd>
2234 <p>
2236 </p>
2237 </dd>
2239 --minimal
2240 </dt>
2241 <dd>
2242 <p>
2243 Spend extra time to make sure the smallest possible
2244 diff is produced.
2245 </p>
2246 </dd>
2248 --patience
2249 </dt>
2250 <dd>
2251 <p>
2252 Generate a diff using the "patience diff" algorithm.
2253 </p>
2254 </dd>
2257 </dt>
2258 <dd>
2259 <p>
2260 Generate a diffstat. You can override the default
2262 The width of the filename part can be controlled by
2263 giving another width to it separated by a comma.
2267 </p>
2268 <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
2269 <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
2270 </dd>
2272 --numstat
2273 </dt>
2274 <dd>
2275 <p>
2277 deleted lines in decimal notation and pathname without
2278 abbreviation, to make it more machine friendly. For
2281 </p>
2282 </dd>
2284 --shortstat
2285 </dt>
2286 <dd>
2287 <p>
2289 number of modified files, as well as number of added and deleted
2290 lines.
2291 </p>
2292 </dd>
2295 </dt>
2296 <dd>
2297 <p>
2298 Output the distribution of relative amount of changes for each
2300 passing it a comma separated list of parameters.
2303 The following parameters are available:
2304 </p>
2308 </dt>
2309 <dd>
2310 <p>
2311 Compute the dirstat numbers by counting the lines that have been
2312 removed from the source, or added to the destination. This ignores
2313 the amount of pure code movements within a file. In other words,
2314 rearranging lines in a file is not counted as much as other changes.
2315 This is the default behavior when no parameter is given.
2316 </p>
2317 </dd>
2320 </dt>
2321 <dd>
2322 <p>
2323 Compute the dirstat numbers by doing the regular line-based diff
2324 analysis, and summing the removed/added line counts. (For binary
2325 files, count 64-byte chunks instead, since binary files have no
2328 lines within a file as much as other changes. The resulting output
2330 </p>
2331 </dd>
2334 </dt>
2335 <dd>
2336 <p>
2337 Compute the dirstat numbers by counting the number of files changed.
2338 Each changed file counts equally in the dirstat analysis. This is
2340 not have to look at the file contents at all.
2341 </p>
2342 </dd>
2345 </dt>
2346 <dd>
2347 <p>
2348 Count changes in a child directory for the parent directory as well.
2350 reported may exceed 100%. The default (non-cumulative) behavior can
2352 </p>
2353 </dd>
2356 </dt>
2357 <dd>
2358 <p>
2359 An integer parameter specifies a cut-off percent (3% by default).
2360 Directories contributing less than this percentage of the changes
2361 are not shown in the output.
2362 </p>
2363 </dd>
2364 </dl></div>
2366 directories with less than 10% of the total amount of changed files,
2367 and accumulating child directory counts in the parent directories:
2369 </dd>
2371 --summary
2372 </dt>
2373 <dd>
2374 <p>
2375 Output a condensed summary of extended header information
2376 such as creations, renames and mode changes.
2377 </p>
2378 </dd>
2380 --patch-with-stat
2381 </dt>
2382 <dd>
2383 <p>
2385 </p>
2386 </dd>
2388 -z
2389 </dt>
2390 <dd>
2391 <p>
2392 Separate the commits with NULs instead of with new newlines.
2393 </p>
2394 <div class="paragraph"><p>Also, when <tt>--raw</tt> or <tt>--numstat</tt> has been given, do not munge
2395 pathnames and use NULs as output field terminators.</p></div>
2396 <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
2398 respectively, and the pathname will be enclosed in double quotes if
2399 any of those replacements occurred.</p></div>
2400 </dd>
2402 --name-only
2403 </dt>
2404 <dd>
2405 <p>
2406 Show only names of changed files.
2407 </p>
2408 </dd>
2410 --name-status
2411 </dt>
2412 <dd>
2413 <p>
2414 Show only names and status of changed files. See the description
2415 of the <tt>--diff-filter</tt> option on what the status letters mean.
2416 </p>
2417 </dd>
2419 --submodule[=<format>]
2420 </dt>
2421 <dd>
2422 <p>
2423 Chose the output format for submodule differences. <format> can be one of
2424 <em>short</em> and <em>log</em>. <em>short</em> just shows pairs of commit names, this format
2425 is used when this option is not given. <em>log</em> is the default value for this
2426 option and lists the commits in that commit range like the <em>summary</em>
2428 </p>
2429 </dd>
2431 --color[=<when>]
2432 </dt>
2433 <dd>
2434 <p>
2435 Show colored diff.
2436 The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
2437 The default value is <tt>never</tt>.
2438 </p>
2439 </dd>
2441 --no-color
2442 </dt>
2443 <dd>
2444 <p>
2445 Turn off colored diff.
2446 It is the same as <tt>--color=never</tt>.
2447 </p>
2448 </dd>
2450 --word-diff[=<mode>]
2451 </dt>
2452 <dd>
2453 <p>
2454 Show a word diff, using the <mode> to delimit changed words.
2455 By default, words are delimited by whitespace; see
2456 <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
2457 must be one of:
2458 </p>
2461 color
2462 </dt>
2463 <dd>
2464 <p>
2465 Highlight changed words using only colors. Implies <tt>--color</tt>.
2466 </p>
2467 </dd>
2469 plain
2470 </dt>
2471 <dd>
2472 <p>
2473 Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
2474 attempts to escape the delimiters if they appear in the input,
2475 so the output may be ambiguous.
2476 </p>
2477 </dd>
2479 porcelain
2480 </dt>
2481 <dd>
2482 <p>
2483 Use a special line-based format intended for script
2484 consumption. Added/removed/unchanged runs are printed in the
2485 usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
2486 character at the beginning of the line and extending to the
2487 end of the line. Newlines in the input are represented by a
2488 tilde <tt>~</tt> on a line of its own.
2489 </p>
2490 </dd>
2492 none
2493 </dt>
2494 <dd>
2495 <p>
2496 Disable word diff again.
2497 </p>
2498 </dd>
2499 </dl></div>
2501 highlight the changed parts in all modes if enabled.</p></div>
2502 </dd>
2504 --word-diff-regex=<regex>
2505 </dt>
2506 <dd>
2507 <p>
2508 Use <regex> to decide what a word is, instead of considering
2509 runs of non-whitespace to be a word. Also implies
2510 <tt>--word-diff</tt> unless it was already enabled.
2511 </p>
2513 <regex> is considered a word. Anything between these matches is
2514 considered whitespace and ignored(!) for the purposes of finding
2515 differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
2516 expression to make sure that it matches all non-whitespace characters.
2517 A match that contains a newline is silently truncated(!) at the
2518 newline.</p></div>
2519 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
2520 <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
2521 overrides any diff driver or configuration setting. Diff drivers
2522 override configuration settings.</p></div>
2523 </dd>
2525 --color-words[=<regex>]
2526 </dt>
2527 <dd>
2528 <p>
2529 Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
2530 specified) <tt>--word-diff-regex=<regex></tt>.
2531 </p>
2532 </dd>
2534 --no-renames
2535 </dt>
2536 <dd>
2537 <p>
2538 Turn off rename detection, even when the configuration
2539 file gives the default to do so.
2540 </p>
2541 </dd>
2543 --check
2544 </dt>
2545 <dd>
2546 <p>
2547 Warn if changes introduce whitespace errors. What are
2548 considered whitespace errors is controlled by <tt>core.whitespace</tt>
2549 configuration. By default, trailing whitespaces (including
2550 lines that solely consist of whitespaces) and a space character
2551 that is immediately followed by a tab character inside the
2552 initial indent of the line are considered whitespace errors.
2553 Exits with non-zero status if problems are found. Not compatible
2554 with --exit-code.
2555 </p>
2556 </dd>
2558 --full-index
2559 </dt>
2560 <dd>
2561 <p>
2562 Instead of the first handful of characters, show the full
2564 line when generating patch format output.
2565 </p>
2566 </dd>
2568 --binary
2569 </dt>
2570 <dd>
2571 <p>
2572 In addition to <tt>--full-index</tt>, output a binary diff that
2573 can be applied with <tt>git-apply</tt>.
2574 </p>
2575 </dd>
2577 --abbrev[=<n>]
2578 </dt>
2579 <dd>
2580 <p>
2581 Instead of showing the full 40-byte hexadecimal object
2582 name in diff-raw format output and diff-tree header
2583 lines, show only a partial prefix. This is
2584 independent of the <tt>--full-index</tt> option above, which controls
2585 the diff-patch output format. Non default number of
2586 digits can be specified with <tt>--abbrev=<n></tt>.
2587 </p>
2588 </dd>
2590 -B[<n>][/<m>]
2591 </dt>
2593 --break-rewrites[=[<n>][/<m>]]
2594 </dt>
2595 <dd>
2596 <p>
2597 Break complete rewrite changes into pairs of delete and
2598 create. This serves two purposes:
2599 </p>
2600 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
2601 not as a series of deletion and insertion mixed together with a very
2602 few lines that happen to match textually as the context, but as a
2603 single deletion of everything old followed by a single insertion of
2604 everything new, and the number <tt>m</tt> controls this aspect of the -B
2605 option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
2606 original should remain in the result for git to consider it a total
2607 rewrite (i.e. otherwise the resulting patch will be a series of
2608 deletion and insertion mixed together with context lines).</p></div>
2609 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
2610 source of a rename (usually -M only considers a file that disappeared
2611 as the source of a rename), and the number <tt>n</tt> controls this aspect of
2612 the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
2613 addition and deletion compared to 20% or more of the file’s size are
2614 eligible for being picked up as a possible source of a rename to
2615 another file.</p></div>
2616 </dd>
2618 -M[<n>]
2619 </dt>
2621 --find-renames[=<n>]
2622 </dt>
2623 <dd>
2624 <p>
2625 If generating diffs, detect and report renames for each commit.
2626 For following files across renames while traversing history, see
2627 <tt>--follow</tt>.
2628 If <tt>n</tt> is specified, it is a threshold on the similarity
2629 index (i.e. amount of addition/deletions compared to the
2630 file’s size). For example, <tt>-M90%</tt> means git should consider a
2631 delete/add pair to be a rename if more than 90% of the file
2632 hasn’t changed.
2633 </p>
2634 </dd>
2636 -C[<n>]
2637 </dt>
2639 --find-copies[=<n>]
2640 </dt>
2641 <dd>
2642 <p>
2643 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
2644 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
2645 </p>
2646 </dd>
2648 --find-copies-harder
2649 </dt>
2650 <dd>
2651 <p>
2652 For performance reasons, by default, <tt>-C</tt> option finds copies only
2653 if the original file of the copy was modified in the same
2654 changeset. This flag makes the command
2655 inspect unmodified files as candidates for the source of
2656 copy. This is a very expensive operation for large
2657 projects, so use it with caution. Giving more than one
2658 <tt>-C</tt> option has the same effect.
2659 </p>
2660 </dd>
2662 -D
2663 </dt>
2665 --irreversible-delete
2666 </dt>
2667 <dd>
2668 <p>
2669 Omit the preimage for deletes, i.e. print only the header but not
2670 the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
2671 is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
2672 solely for people who want to just concentrate on reviewing the
2673 text after the change. In addition, the output obviously lack
2674 enough information to apply such a patch in reverse, even manually,
2675 hence the name of the option.
2676 </p>
2677 <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
2678 of a delete/create pair.</p></div>
2679 </dd>
2681 -l<num>
2682 </dt>
2683 <dd>
2684 <p>
2685 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
2686 is the number of potential rename/copy targets. This
2687 option prevents rename/copy detection from running if
2688 the number of rename/copy targets exceeds the specified
2689 number.
2690 </p>
2691 </dd>
2693 --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
2694 </dt>
2695 <dd>
2696 <p>
2697 Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
2698 Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
2699 type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
2700 are Unmerged (<tt>U</tt>), are
2701 Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
2702 Any combination of the filter characters (including none) can be used.
2703 When <tt>*</tt> (All-or-none) is added to the combination, all
2704 paths are selected if there is any file that matches
2705 other criteria in the comparison; if there is no file
2706 that matches other criteria, nothing is selected.
2707 </p>
2708 </dd>
2710 -S<string>
2711 </dt>
2712 <dd>
2713 <p>
2714 Look for differences that introduce or remove an instance of
2715 <string>. Note that this is different than the string simply
2716 appearing in diff output; see the <em>pickaxe</em> entry in
2718 </p>
2719 </dd>
2721 -G<regex>
2722 </dt>
2723 <dd>
2724 <p>
2725 Look for differences whose added or removed line matches
2726 the given <regex>.
2727 </p>
2728 </dd>
2730 --pickaxe-all
2731 </dt>
2732 <dd>
2733 <p>
2734 When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
2735 changeset, not just the files that contain the change
2736 in <string>.
2737 </p>
2738 </dd>
2740 --pickaxe-regex
2741 </dt>
2742 <dd>
2743 <p>
2744 Make the <string> not a plain string but an extended POSIX
2745 regex to match.
2746 </p>
2747 </dd>
2749 -O<orderfile>
2750 </dt>
2751 <dd>
2752 <p>
2753 Output the patch in the order specified in the
2754 <orderfile>, which has one shell glob pattern per line.
2755 </p>
2756 </dd>
2758 -R
2759 </dt>
2760 <dd>
2761 <p>
2762 Swap two inputs; that is, show differences from index or
2763 on-disk file to tree contents.
2764 </p>
2765 </dd>
2767 --relative[=<path>]
2768 </dt>
2769 <dd>
2770 <p>
2771 When run from a subdirectory of the project, it can be
2772 told to exclude changes outside the directory and show
2773 pathnames relative to it with this option. When you are
2774 not in a subdirectory (e.g. in a bare repository), you
2775 can name which subdirectory to make the output relative
2776 to by giving a <path> as an argument.
2777 </p>
2778 </dd>
2780 -a
2781 </dt>
2783 --text
2784 </dt>
2785 <dd>
2786 <p>
2787 Treat all files as text.
2788 </p>
2789 </dd>
2791 --ignore-space-at-eol
2792 </dt>
2793 <dd>
2794 <p>
2795 Ignore changes in whitespace at EOL.
2796 </p>
2797 </dd>
2799 -b
2800 </dt>
2802 --ignore-space-change
2803 </dt>
2804 <dd>
2805 <p>
2806 Ignore changes in amount of whitespace. This ignores whitespace
2807 at line end, and considers all other sequences of one or
2808 more whitespace characters to be equivalent.
2809 </p>
2810 </dd>
2812 -w
2813 </dt>
2815 --ignore-all-space
2816 </dt>
2817 <dd>
2818 <p>
2819 Ignore whitespace when comparing lines. This ignores
2820 differences even if one line has whitespace where the other
2821 line has none.
2822 </p>
2823 </dd>
2825 --inter-hunk-context=<lines>
2826 </dt>
2827 <dd>
2828 <p>
2829 Show the context between diff hunks, up to the specified number
2830 of lines, thereby fusing hunks that are close to each other.
2831 </p>
2832 </dd>
2834 --exit-code
2835 </dt>
2836 <dd>
2837 <p>
2838 Make the program exit with codes similar to diff(1).
2839 That is, it exits with 1 if there were differences and
2840 0 means no differences.
2841 </p>
2842 </dd>
2844 --quiet
2845 </dt>
2846 <dd>
2847 <p>
2848 Disable all output of the program. Implies <tt>--exit-code</tt>.
2849 </p>
2850 </dd>
2852 --ext-diff
2853 </dt>
2854 <dd>
2855 <p>
2856 Allow an external diff helper to be executed. If you set an
2859 </p>
2860 </dd>
2862 --no-ext-diff
2863 </dt>
2864 <dd>
2865 <p>
2866 Disallow external diff drivers.
2867 </p>
2868 </dd>
2870 --textconv
2871 </dt>
2873 --no-textconv
2874 </dt>
2875 <dd>
2876 <p>
2877 Allow (or disallow) external text conversion filters to be run
2879 details. Because textconv filters are typically a one-way
2880 conversion, the resulting diff is suitable for human
2881 consumption, but cannot be applied. For this reason, textconv
2883 <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
2884 diff plumbing commands.
2885 </p>
2886 </dd>
2888 --ignore-submodules[=<when>]
2889 </dt>
2890 <dd>
2891 <p>
2892 Ignore changes to submodules in the diff generation. <when> can be
2895 untracked or modified files or its HEAD differs from the commit recorded
2896 in the superproject and can be used to override any settings of the
2897 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
2899 contain untracked content (but they are still scanned for modified
2901 only changes to the commits stored in the superproject are shown (this was
2903 </p>
2904 </dd>
2906 --src-prefix=<prefix>
2907 </dt>
2908 <dd>
2909 <p>
2911 </p>
2912 </dd>
2914 --dst-prefix=<prefix>
2915 </dt>
2916 <dd>
2917 <p>
2919 </p>
2920 </dd>
2922 --no-prefix
2923 </dt>
2924 <dd>
2925 <p>
2926 Do not show any source or destination prefix.
2927 </p>
2928 </dd>
2929 </dl></div>
2932 </div>
2938 do not produce the output described above; instead they produce a
2939 patch file. You can customize the creation of such patches via the
2940 GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
2941 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
2942 diff format:</p></div>
2944 <li>
2945 <p>
2947 </p>
2950 <pre><tt>diff --git a/file1 b/file2</tt></pre>
2951 </div></div>
2952 <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
2953 involved. Especially, even for a creation or a deletion,
2954 <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
2955 <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
2956 name of the source file of the rename/copy and the name of
2957 the file that rename/copy produces, respectively.</p></div>
2958 </li>
2959 <li>
2960 <p>
2961 It is followed by one or more extended header lines:
2962 </p>
2965 <pre><tt>old mode <mode>
2966 new mode <mode>
2967 deleted file mode <mode>
2968 new file mode <mode>
2969 copy from <path>
2970 copy to <path>
2971 rename from <path>
2972 rename to <path>
2973 similarity index <number>
2974 dissimilarity index <number>
2975 index <hash>..<hash> <mode></tt></pre>
2976 </div></div>
2977 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
2978 and file permission bits.</p></div>
2979 <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
2981 the dissimilarity index is the percentage of changed lines. It
2982 is a rounded down integer, followed by a percent sign. The
2983 similarity index value of 100% is thus reserved for two equal
2984 files, while 100% dissimilarity means that no line from the old
2985 file made it into the new one.</p></div>
2986 <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
2987 The <mode> is included if the file mode does not change; otherwise,
2988 separate lines indicate the old and the new mode.</p></div>
2989 </li>
2990 <li>
2991 <p>
2992 TAB, LF, double quote and backslash characters in pathnames
2994 If there is need for such substitution then the whole
2995 pathname is put in double quotes.
2996 </p>
2997 </li>
2998 <li>
2999 <p>
3002 It is incorrect to apply each change to each file sequentially. For
3003 example, this patch will swap a and b:
3004 </p>
3007 <pre><tt>diff --git a/a b/b
3008 rename from a
3009 rename to b
3010 diff --git a/b b/a
3011 rename from b
3012 rename to a</tt></pre>
3013 </div></div>
3014 </li>
3015 </ol></div>
3016 </div>
3019 <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
3022 <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
3023 of these commands to force generation of diffs with individual parents
3024 of a merge.</p></div>
3028 <pre><tt>diff --combined describe.c
3029 index fabadb8,cc95eb0..4866510
3030 --- a/describe.c
3031 +++ b/describe.c
3034 }
3036 - static void describe(char *arg)
3037 -static void describe(struct commit *cmit, int last_one)
3038 ++static void describe(char *arg, int last_one)
3039 {
3040 + unsigned char sha1[20];
3041 + struct commit *cmit;
3042 struct commit_list *list;
3043 static int initialized = 0;
3044 struct commit_name *n;
3047 + usage(describe_usage);
3048 + cmit = lookup_commit_reference(sha1);
3049 + if (!cmit)
3050 + usage(describe_usage);
3051 +
3052 if (!initialized) {
3053 initialized = 1;
3054 for_each_ref(get_name);</tt></pre>
3055 </div></div>
3057 <li>
3058 <p>
3059 It is preceded with a "git diff" header, that looks like
3061 </p>
3065 </div></div>
3070 </div></div>
3071 </li>
3072 <li>
3073 <p>
3074 It is followed by one or more extended header lines
3075 (this example shows a merge with two parents):
3076 </p>
3083 </div></div>
3084 <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
3086 information about detected contents movement (renames and
3087 copying detection) are designed to work with diff of two
3089 </li>
3090 <li>
3091 <p>
3092 It is followed by two-line from-file/to-file header
3093 </p>
3096 <pre><tt>--- a/file
3097 +++ b/file</tt></pre>
3098 </div></div>
3101 files.</p></div>
3102 </li>
3103 <li>
3104 <p>
3105 Chunk header format is modified to prevent people from
3107 was created for review of merge commit changes, and was not
3108 meant for apply. The change is similar to the change in the
3110 </p>
3113 <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
3114 </div></div>
3116 header for combined diff format.</p></div>
3117 </li>
3118 </ol></div>
3120 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
3122 compares two or more files file1, file2,… with one file X, and
3123 shows how X differs from each of fileN. One column for each of
3124 fileN is prepended to the output line to note how X’s line is
3125 different from it.</p></div>
3126 <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
3128 in the column N means that the line appears in the result,
3129 and fileN does not have that line (in other words, the line was
3130 added, from the point of view of that parent).</p></div>
3134 in either file1 nor file2). Also eight other lines are the same
3136 <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
3137 merge commit with the merge result (i.e. file1..fileN are the
3139 two unresolved merge parents with the working tree file
3142 </div>
3148 </dt>
3149 <dd>
3150 <p>
3151 Show the whole commit history, but skip any merges
3152 </p>
3153 </dd>
3156 </dt>
3157 <dd>
3158 <p>
3160 in the include/scsi or drivers/scsi subdirectories
3161 </p>
3162 </dd>
3165 </dt>
3166 <dd>
3167 <p>
3171 </p>
3172 </dd>
3175 </dt>
3176 <dd>
3177 <p>
3178 Show the commits that are in the "test" branch but not yet
3179 in the "release" branch, along with the list of paths
3180 each commit modifies.
3181 </p>
3182 </dd>
3185 </dt>
3186 <dd>
3187 <p>
3188 Shows the commits that changed builtin-rev-list.c, including
3189 those commits that occurred before the file was given its
3190 present name.
3191 </p>
3192 </dd>
3195 </dt>
3196 <dd>
3197 <p>
3198 Shows all commits that are in any of local branches but not in
3200 origin doesn’t).
3201 </p>
3202 </dd>
3205 </dt>
3206 <dd>
3207 <p>
3208 Shows all commits that are in local master but not in any remote
3209 repository master branches.
3210 </p>
3211 </dd>
3214 </dt>
3215 <dd>
3216 <p>
3217 Shows the history including change diffs, but only from the
3218 "main branch" perspective, skipping commits that come from merged
3219 branches, and showing full diffs of changes introduced by the merges.
3220 This makes sense only when following a strict policy of merging all
3221 topic branches when staying on a single integration branch.
3222 </p>
3223 </dd>
3224 </dl></div>
3225 </div>
3230 <li>
3231 <p>
3232 The pathnames recorded in the index and in the tree objects
3233 are treated as uninterpreted sequences of non-NUL bytes.
3234 What readdir(2) returns are what are recorded and compared
3235 with the data git keeps track of, which in turn are expected
3237 thing as pathname encoding translation.
3238 </p>
3239 </li>
3240 <li>
3241 <p>
3242 The contents of the blob objects are uninterpreted sequences
3243 of bytes. There is no encoding translation at the core
3244 level.
3245 </p>
3246 </li>
3247 <li>
3248 <p>
3249 The commit log messages are uninterpreted sequences of non-NUL
3250 bytes.
3251 </p>
3252 </li>
3253 </ul></div>
3255 in UTF-8, both the core and git Porcelain are designed not to
3256 force UTF-8 on projects. If all participants of a particular
3257 project find it more convenient to use legacy encodings, git
3258 does not forbid it. However, there are a few things to keep in
3259 mind.</p></div>
3261 <li>
3262 <p>
3264 a warning if the commit log message given to it does not look
3265 like a valid UTF-8 string, unless you explicitly say your
3266 project uses a legacy encoding. The way to say this is to
3268 </p>
3271 <pre><tt>[i18n]
3273 </div></div>
3276 help other people who look at them later. Lack of this header
3278 </li>
3279 <li>
3280 <p>
3283 log message into UTF-8 unless otherwise specified. You can
3284 specify the desired output encoding with
3286 </p>
3289 <pre><tt>[i18n]
3291 </div></div>
3294 </li>
3295 </ol></div>
3297 message when a commit is made to force UTF-8 at the commit
3298 object level, because re-coding to UTF-8 is not necessarily a
3299 reversible operation.</p></div>
3300 </div>
3303 <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>
3304 for settings related to diff generation.</p></div>
3307 format.pretty
3308 </dt>
3309 <dd>
3310 <p>
3312 Defaults to "medium".
3313 </p>
3314 </dd>
3316 i18n.logOutputEncoding
3317 </dt>
3318 <dd>
3319 <p>
3320 Encoding to use when displaying logs. (See "Discussion", above.)
3322 otherwise.
3323 </p>
3324 </dd>
3326 log.date
3327 </dt>
3328 <dd>
3329 <p>
3330 Default format for human-readable dates. (Compare the
3333 </p>
3334 </dd>
3336 log.showroot
3337 </dt>
3338 <dd>
3339 <p>
3341 initial commit as a big creation event. Any root commits in
3344 </p>
3345 </dd>
3347 mailmap.file
3348 </dt>
3349 <dd>
3350 <p>
3352 </p>
3353 </dd>
3355 notes.displayRef
3356 </dt>
3357 <dd>
3358 <p>
3363 </p>
3365 multiple times. A warning will be issued for refs that do not exist,
3366 but a glob that does not match any refs is silently ignored.</p></div>
3370 </dd>
3371 </dl></div>
3372 </div>
3376 </div>
3377 </div>
3382 </div>
3383 </div>
3384 </body>
3385 </html>