| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | |
| "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | |
| <head> | |
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> | |
| <meta name="generator" content="AsciiDoc 8.5.2" /> | |
| <title>git-log(1)</title> | |
| <style type="text/css"> | |
| /* Debug borders */ | |
| p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { | |
| /* | |
| border: 1px solid red; | |
| */ | |
| } | |
| body { | |
| margin: 1em 5% 1em 5%; | |
| } | |
| a { | |
| color: blue; | |
| text-decoration: underline; | |
| } | |
| a:visited { | |
| color: fuchsia; | |
| } | |
| em { | |
| font-style: italic; | |
| color: navy; | |
| } | |
| strong { | |
| font-weight: bold; | |
| color: #083194; | |
| } | |
| tt { | |
| color: navy; | |
| } | |
| h1, h2, h3, h4, h5, h6 { | |
| color: #527bbd; | |
| font-family: sans-serif; | |
| margin-top: 1.2em; | |
| margin-bottom: 0.5em; | |
| line-height: 1.3; | |
| } | |
| h1, h2, h3 { | |
| border-bottom: 2px solid silver; | |
| } | |
| h2 { | |
| padding-top: 0.5em; | |
| } | |
| h3 { | |
| float: left; | |
| } | |
| h3 + * { | |
| clear: left; | |
| } | |
| div.sectionbody { | |
| font-family: serif; | |
| margin-left: 0; | |
| } | |
| hr { | |
| border: 1px solid silver; | |
| } | |
| p { | |
| margin-top: 0.5em; | |
| margin-bottom: 0.5em; | |
| } | |
| ul, ol, li > p { | |
| margin-top: 0; | |
| } | |
| pre { | |
| padding: 0; | |
| margin: 0; | |
| } | |
| span#author { | |
| color: #527bbd; | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| font-size: 1.1em; | |
| } | |
| span#email { | |
| } | |
| span#revnumber, span#revdate, span#revremark { | |
| font-family: sans-serif; | |
| } | |
| div#footer { | |
| font-family: sans-serif; | |
| font-size: small; | |
| border-top: 2px solid silver; | |
| padding-top: 0.5em; | |
| margin-top: 4.0em; | |
| } | |
| div#footer-text { | |
| float: left; | |
| padding-bottom: 0.5em; | |
| } | |
| div#footer-badges { | |
| float: right; | |
| padding-bottom: 0.5em; | |
| } | |
| div#preamble { | |
| margin-top: 1.5em; | |
| margin-bottom: 1.5em; | |
| } | |
| div.tableblock, div.imageblock, div.exampleblock, div.verseblock, | |
| div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, | |
| div.admonitionblock { | |
| margin-top: 1.0em; | |
| margin-bottom: 1.5em; | |
| } | |
| div.admonitionblock { | |
| margin-top: 2.0em; | |
| margin-bottom: 2.0em; | |
| margin-right: 10%; | |
| color: #606060; | |
| } | |
| div.content { /* Block element content. */ | |
| padding: 0; | |
| } | |
| /* Block element titles. */ | |
| div.title, caption.title { | |
| color: #527bbd; | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| text-align: left; | |
| margin-top: 1.0em; | |
| margin-bottom: 0.5em; | |
| } | |
| div.title + * { | |
| margin-top: 0; | |
| } | |
| td div.title:first-child { | |
| margin-top: 0.0em; | |
| } | |
| div.content div.title:first-child { | |
| margin-top: 0.0em; | |
| } | |
| div.content + div.title { | |
| margin-top: 0.0em; | |
| } | |
| div.sidebarblock > div.content { | |
| background: #ffffee; | |
| border: 1px solid silver; | |
| padding: 0.5em; | |
| } | |
| div.listingblock > div.content { | |
| border: 1px solid silver; | |
| background: #f4f4f4; | |
| padding: 0.5em; | |
| } | |
| div.quoteblock, div.verseblock { | |
| padding-left: 1.0em; | |
| margin-left: 1.0em; | |
| margin-right: 10%; | |
| border-left: 5px solid #dddddd; | |
| color: #777777; | |
| } | |
| div.quoteblock > div.attribution { | |
| padding-top: 0.5em; | |
| text-align: right; | |
| } | |
| div.verseblock > div.content { | |
| white-space: pre; | |
| } | |
| div.verseblock > div.attribution { | |
| padding-top: 0.75em; | |
| text-align: left; | |
| } | |
| /* DEPRECATED: Pre version 8.2.7 verse style literal block. */ | |
| div.verseblock + div.attribution { | |
| text-align: left; | |
| } | |
| div.admonitionblock .icon { | |
| vertical-align: top; | |
| font-size: 1.1em; | |
| font-weight: bold; | |
| text-decoration: underline; | |
| color: #527bbd; | |
| padding-right: 0.5em; | |
| } | |
| div.admonitionblock td.content { | |
| padding-left: 0.5em; | |
| border-left: 3px solid #dddddd; | |
| } | |
| div.exampleblock > div.content { | |
| border-left: 3px solid #dddddd; | |
| padding-left: 0.5em; | |
| } | |
| div.imageblock div.content { padding-left: 0; } | |
| span.image img { border-style: none; } | |
| a.image:visited { color: white; } | |
| dl { | |
| margin-top: 0.8em; | |
| margin-bottom: 0.8em; | |
| } | |
| dt { | |
| margin-top: 0.5em; | |
| margin-bottom: 0; | |
| font-style: normal; | |
| color: navy; | |
| } | |
| dd > *:first-child { | |
| margin-top: 0.1em; | |
| } | |
| ul, ol { | |
| list-style-position: outside; | |
| } | |
| ol.arabic { | |
| list-style-type: decimal; | |
| } | |
| ol.loweralpha { | |
| list-style-type: lower-alpha; | |
| } | |
| ol.upperalpha { | |
| list-style-type: upper-alpha; | |
| } | |
| ol.lowerroman { | |
| list-style-type: lower-roman; | |
| } | |
| ol.upperroman { | |
| list-style-type: upper-roman; | |
| } | |
| div.compact ul, div.compact ol, | |
| div.compact p, div.compact p, | |
| div.compact div, div.compact div { | |
| margin-top: 0.1em; | |
| margin-bottom: 0.1em; | |
| } | |
| div.tableblock > table { | |
| border: 3px solid #527bbd; | |
| } | |
| thead, p.table.header { | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| } | |
| tfoot { | |
| font-weight: bold; | |
| } | |
| td > div.verse { | |
| white-space: pre; | |
| } | |
| p.table { | |
| margin-top: 0; | |
| } | |
| /* Because the table frame attribute is overriden by CSS in most browsers. */ | |
| div.tableblock > table[frame="void"] { | |
| border-style: none; | |
| } | |
| div.tableblock > table[frame="hsides"] { | |
| border-left-style: none; | |
| border-right-style: none; | |
| } | |
| div.tableblock > table[frame="vsides"] { | |
| border-top-style: none; | |
| border-bottom-style: none; | |
| } | |
| div.hdlist { | |
| margin-top: 0.8em; | |
| margin-bottom: 0.8em; | |
| } | |
| div.hdlist tr { | |
| padding-bottom: 15px; | |
| } | |
| dt.hdlist1.strong, td.hdlist1.strong { | |
| font-weight: bold; | |
| } | |
| td.hdlist1 { | |
| vertical-align: top; | |
| font-style: normal; | |
| padding-right: 0.8em; | |
| color: navy; | |
| } | |
| td.hdlist2 { | |
| vertical-align: top; | |
| } | |
| div.hdlist.compact tr { | |
| margin: 0; | |
| padding-bottom: 0; | |
| } | |
| .comment { | |
| background: yellow; | |
| } | |
| .footnote, .footnoteref { | |
| font-size: 0.8em; | |
| } | |
| span.footnote, span.footnoteref { | |
| vertical-align: super; | |
| } | |
| #footnotes { | |
| margin: 20px 0 20px 0; | |
| padding: 7px 0 0 0; | |
| } | |
| #footnotes div.footnote { | |
| margin: 0 0 5px 0; | |
| } | |
| #footnotes hr { | |
| border: none; | |
| border-top: 1px solid silver; | |
| height: 1px; | |
| text-align: left; | |
| margin-left: 0; | |
| width: 20%; | |
| min-width: 100px; | |
| } | |
| @media print { | |
| div#footer-badges { display: none; } | |
| } | |
| div#toc { | |
| margin-bottom: 2.5em; | |
| } | |
| div#toctitle { | |
| color: #527bbd; | |
| font-family: sans-serif; | |
| font-size: 1.1em; | |
| font-weight: bold; | |
| margin-top: 1.0em; | |
| margin-bottom: 0.1em; | |
| } | |
| div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { | |
| margin-top: 0; | |
| margin-bottom: 0; | |
| } | |
| div.toclevel2 { | |
| margin-left: 2em; | |
| font-size: 0.9em; | |
| } | |
| div.toclevel3 { | |
| margin-left: 4em; | |
| font-size: 0.9em; | |
| } | |
| div.toclevel4 { | |
| margin-left: 6em; | |
| font-size: 0.9em; | |
| } | |
| /* Overrides for manpage documents */ | |
| h1 { | |
| padding-top: 0.5em; | |
| padding-bottom: 0.5em; | |
| border-top: 2px solid silver; | |
| border-bottom: 2px solid silver; | |
| } | |
| h2 { | |
| border-style: none; | |
| } | |
| div.sectionbody { | |
| margin-left: 5%; | |
| } | |
| @media print { | |
| div#toc { display: none; } | |
| } | |
| /* Workarounds for IE6's broken and incomplete CSS2. */ | |
| div.sidebar-content { | |
| background: #ffffee; | |
| border: 1px solid silver; | |
| padding: 0.5em; | |
| } | |
| div.sidebar-title, div.image-title { | |
| color: #527bbd; | |
| font-family: sans-serif; | |
| font-weight: bold; | |
| margin-top: 0.0em; | |
| margin-bottom: 0.5em; | |
| } | |
| div.listingblock div.content { | |
| border: 1px solid silver; | |
| background: #f4f4f4; | |
| padding: 0.5em; | |
| } | |
| div.quoteblock-attribution { | |
| padding-top: 0.5em; | |
| text-align: right; | |
| } | |
| div.verseblock-content { | |
| white-space: pre; | |
| } | |
| div.verseblock-attribution { | |
| padding-top: 0.75em; | |
| text-align: left; | |
| } | |
| div.exampleblock-content { | |
| border-left: 3px solid #dddddd; | |
| padding-left: 0.5em; | |
| } | |
| /* IE6 sets dynamically generated links as visited. */ | |
| div#toc a:visited { color: blue; } | |
| </style> | |
| <script type="text/javascript"> | |
| /*<+'])'); | |
| // Function that scans the DOM tree for header elements (the DOM2 | |
| // nodeIterator API would be a better technique but not supported by all | |
| // browsers). | |
| var iterate = function (el) { | |
| for (var i = el.firstChild; i != null; i = i.nextSibling) { | |
| if (i.nodeType == 1 /* Node.ELEMENT_NODE */) { | |
| var mo = re.exec(i.tagName); | |
| if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") { | |
| result[result.length] = new TocEntry(i, getText(i), mo[1]-1); | |
| } | |
| iterate(i); | |
| } | |
| } | |
| } | |
| iterate(el); | |
| return result; | |
| } | |
| var toc = document.getElementById("toc"); | |
| var entries = tocEntries(document.getElementById("content"), toclevels); | |
| for (var i = 0; i < entries.length; ++i) { | |
| var entry = entries[i]; | |
| if (entry.element.id == "") | |
| entry.element.id = "_toc_" + i; | |
| var a = document.createElement("a"); | |
| a.href = "#" + entry.element.id; | |
| a.appendChild(document.createTextNode(entry.text)); | |
| var div = document.createElement("div"); | |
| div.appendChild(a); | |
| div.className = "toclevel" + entry.toclevel; | |
| toc.appendChild(div); | |
| } | |
| if (entries.length == 0) | |
| toc.parentNode.removeChild(toc); | |
| }, | |
| ///////////////////////////////////////////////////////////////////// | |
| // Footnotes generator | |
| ///////////////////////////////////////////////////////////////////// | |
| /* Based on footnote generation code from: | |
| * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html | |
| */ | |
| footnotes: function () { | |
| var cont = document.getElementById("content"); | |
| var noteholder = document.getElementById("footnotes"); | |
| var spans = cont.getElementsByTagName("span"); | |
| var refs = {}; | |
| var n = 0; | |
| for (i=0; i<spans.length; i++) { | |
| if (spans[i].className == "footnote") { | |
| n++; | |
| // Use [\s\S] in place of . so multi-line matches work. | |
| // Because JavaScript has no s (dotall) regex flag. | |
| note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1]; | |
| noteholder.innerHTML += | |
| "<div class='footnote' id='_footnote_" + n + "'>" + | |
| "<a href='#_footnoteref_" + n + "' title='Return to text'>" + | |
| n + "</a>. " + note + "</div>"; | |
| spans[i].innerHTML = | |
| "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + | |
| "' title='View footnote' class='footnote'>" + n + "</a>]"; | |
| var id =spans[i].getAttribute("id"); | |
| if (id != null) refs["#"+id] = n; | |
| } | |
| } | |
| if (n == 0) | |
| noteholder.parentNode.removeChild(noteholder); | |
| else { | |
| // Process footnoterefs. | |
| for (i=0; i<spans.length; i++) { | |
| if (spans[i].className == "footnoteref") { | |
| var href = spans[i].getElementsByTagName("a")[0].getAttribute("href"); | |
| href = href.match(/#.*/)[0]; // Because IE return full URL. | |
| n = refs[href]; | |
| spans[i].innerHTML = | |
| "[<a href='#_footnote_" + n + | |
| "' title='View footnote' class='footnote'>" + n + "</a>]"; | |
| } | |
| } | |
| } | |
| } | |
| } | |
| /*]]>*/ | |
| </script> | |
| </head> | |
| <body> | |
| <div id="header"> | |
| <h1> | |
| git-log(1) Manual Page | |
| </h1> | |
| <h2>NAME</h2> | |
| <div class="sectionbody"> | |
| <p>git-log - | |
| Show commit logs | |
| </p> | |
| </div> | |
| </div> | |
| <div id="content"> | |
| <h2 id="_synopsis">SYNOPSIS</h2> | |
| <div class="sectionbody"> | |
| <div class="verseblock"> | |
| <div class="verseblock-content"><em>git log</em> [<options>] [<since>..<until>] [[--] <path>…]</div> | |
| <div class="verseblock-attribution"> | |
| </div></div> | |
| </div> | |
| <h2 id="_description">DESCRIPTION</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>Shows the commit logs.</p></div> | |
| <div class="paragraph"><p>The command takes options applicable to the <em>git rev-list</em> | |
| command to control what is shown and how, and options applicable to | |
| the <em>git diff-*</em> commands to control how the changes | |
| each commit introduces are shown.</p></div> | |
| </div> | |
| <h2 id="_options">OPTIONS</h2> | |
| <div class="sectionbody"> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| -<n> | |
| </dt> | |
| <dd> | |
| <p> | |
| Limits the number of commits to show. | |
| Note that this is a commit limiting option, see below. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <since>..<until> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show only commits between the named two commits. When | |
| either <since> or <until> is omitted, it defaults to | |
| <tt>HEAD</tt>, i.e. the tip of the current branch. | |
| For a more complete list of ways to spell <since> | |
| and <until>, see <a href="gitrevisions.html">gitrevisions(7)</a>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --follow | |
| </dt> | |
| <dd> | |
| <p> | |
| Continue listing the history of a file beyond renames | |
| (works only for a single file). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-decorate | |
| </dt> | |
| <dt class="hdlist1"> | |
| --decorate[=short|full|no] | |
| </dt> | |
| <dd> | |
| <p> | |
| Print out the ref names of any commits that are shown. If <em>short</em> is | |
| specified, the ref name prefixes <em>refs/heads/</em>, <em>refs/tags/</em> and | |
| <em>refs/remotes/</em> will not be printed. If <em>full</em> is specified, the | |
| full ref name (including prefix) will be printed. The default option | |
| is <em>short</em>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --source | |
| </dt> | |
| <dd> | |
| <p> | |
| Print out the ref name given on the command line by which each | |
| commit was reached. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --full-diff | |
| </dt> | |
| <dd> | |
| <p> | |
| Without this flag, "git log -p <path>…" shows commits that | |
| touch the specified paths, and diffs about the same specified | |
| paths. With this, the full diff is shown for commits that touch | |
| the specified paths; this means that "<path>…" limits only | |
| commits, and doesn’t limit diff for those commits. | |
| </p> | |
| <div class="paragraph"><p>Note that this affects all diff-based output types, e.g. those | |
| produced by --stat etc.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --log-size | |
| </dt> | |
| <dd> | |
| <p> | |
| Before the log message print out its size in bytes. Intended | |
| mainly for porcelain tools consumption. If git is unable to | |
| produce a valid value size is set to zero. | |
| Note that only message is considered, if also a diff is shown | |
| its size is not included. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| [--] <path>… | |
| </dt> | |
| <dd> | |
| <p> | |
| Show only commits that are enough to explain how the files | |
| that match the specified paths came to be. See "History | |
| Simplification" below for details and other simplification | |
| modes. | |
| </p> | |
| <div class="paragraph"><p>To prevent confusion with options and branch names, paths may need to | |
| be prefixed with "-- " to separate them from options or refnames.</p></div> | |
| </dd> | |
| </dl></div> | |
| <h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div> | |
| <div class="paragraph"><p>Besides specifying a range of commits that should be listed using the | |
| special notations explained in the description, additional commit | |
| limiting may be applied. Note that they are applied before commit | |
| ordering and formatting options, such as <em>--reverse</em>.</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| -n <em>number</em> | |
| </dt> | |
| <dt class="hdlist1"> | |
| --max-count=<number> | |
| </dt> | |
| <dd> | |
| <p> | |
| Limit the number of commits to output. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --skip=<number> | |
| </dt> | |
| <dd> | |
| <p> | |
| Skip <em>number</em> commits before starting to show the commit output. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --since=<date> | |
| </dt> | |
| <dt class="hdlist1"> | |
| --after=<date> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show commits more recent than a specific date. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --until=<date> | |
| </dt> | |
| <dt class="hdlist1"> | |
| --before=<date> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show commits older than a specific date. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --author=<pattern> | |
| </dt> | |
| <dt class="hdlist1"> | |
| --committer=<pattern> | |
| </dt> | |
| <dd> | |
| <p> | |
| Limit the commits output to ones with author/committer | |
| header lines that match the specified pattern (regular expression). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --grep=<pattern> | |
| </dt> | |
| <dd> | |
| <p> | |
| Limit the commits output to ones with log message that | |
| matches the specified pattern (regular expression). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --all-match | |
| </dt> | |
| <dd> | |
| <p> | |
| Limit the commits output to ones that match all given --grep, | |
| --author and --committer instead of ones that match at least one. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -i | |
| </dt> | |
| <dt class="hdlist1"> | |
| --regexp-ignore-case | |
| </dt> | |
| <dd> | |
| <p> | |
| Match the regexp limiting patterns without regard to letters case. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -E | |
| </dt> | |
| <dt class="hdlist1"> | |
| --extended-regexp | |
| </dt> | |
| <dd> | |
| <p> | |
| Consider the limiting patterns to be extended regular expressions | |
| instead of the default basic regular expressions. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -F | |
| </dt> | |
| <dt class="hdlist1"> | |
| --fixed-strings | |
| </dt> | |
| <dd> | |
| <p> | |
| Consider the limiting patterns to be fixed strings (don’t interpret | |
| pattern as a regular expression). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --remove-empty | |
| </dt> | |
| <dd> | |
| <p> | |
| Stop when a given path disappears from the tree. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --merges | |
| </dt> | |
| <dd> | |
| <p> | |
| Print only merge commits. This is exactly the same as <tt>--min-parents=2</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-merges | |
| </dt> | |
| <dd> | |
| <p> | |
| Do not print commits with more than one parent. This is | |
| exactly the same as <tt>--max-parents=1</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --min-parents=<number> | |
| </dt> | |
| <dt class="hdlist1"> | |
| --max-parents=<number> | |
| </dt> | |
| <dt class="hdlist1"> | |
| --no-min-parents | |
| </dt> | |
| <dt class="hdlist1"> | |
| --no-max-parents | |
| </dt> | |
| <dd> | |
| <p> | |
| Show only commits which have at least (or at most) that many | |
| commits. In particular, <tt>--max-parents=1</tt> is the same as <tt>--no-merges</tt>, | |
| <tt>--min-parents=2</tt> is the same as <tt>--merges</tt>. <tt>--max-parents=0</tt> | |
| gives all root commits and <tt>--min-parents=3</tt> all octopus merges. | |
| </p> | |
| <div class="paragraph"><p><tt>--no-min-parents</tt> and <tt>--no-max-parents</tt> reset these limits (to no limit) | |
| again. Equivalent forms are <tt>--min-parents=0</tt> (any commit has 0 or more | |
| parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit).</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --first-parent | |
| </dt> | |
| <dd> | |
| <p> | |
| Follow only the first parent commit upon seeing a merge | |
| commit. This option can give a better overview when | |
| viewing the evolution of a particular topic branch, | |
| because merges into a topic branch tend to be only about | |
| adjusting to updated upstream from time to time, and | |
| this option allows you to ignore the individual commits | |
| brought in to your history by such a merge. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --not | |
| </dt> | |
| <dd> | |
| <p> | |
| Reverses the meaning of the <em>^</em> prefix (or lack thereof) | |
| for all following revision specifiers, up to the next <em>--not</em>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --all | |
| </dt> | |
| <dd> | |
| <p> | |
| Pretend as if all the refs in <tt>refs/</tt> are listed on the | |
| command line as <em><commit></em>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --branches[=<pattern>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Pretend as if all the refs in <tt>refs/heads</tt> are listed | |
| on the command line as <em><commit></em>. If <em><pattern></em> is given, limit | |
| branches to ones matching given shell glob. If pattern lacks <em>?</em>, | |
| <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --tags[=<pattern>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Pretend as if all the refs in <tt>refs/tags</tt> are listed | |
| on the command line as <em><commit></em>. If <em><pattern></em> is given, limit | |
| tags to ones matching given shell glob. If pattern lacks <em>?</em>, <em>*</em>, | |
| or <em>[</em>, <em>/*</em> at the end is implied. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --remotes[=<pattern>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Pretend as if all the refs in <tt>refs/remotes</tt> are listed | |
| on the command line as <em><commit></em>. If <em><pattern></em> is given, limit | |
| remote-tracking branches to ones matching given shell glob. | |
| If pattern lacks <em>?</em>, <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --glob=<glob-pattern> | |
| </dt> | |
| <dd> | |
| <p> | |
| Pretend as if all the refs matching shell glob <em><glob-pattern></em> | |
| are listed on the command line as <em><commit></em>. Leading <em>refs/</em>, | |
| is automatically prepended if missing. If pattern lacks <em>?</em>, <em>*</em>, | |
| or <em>[</em>, <em>/*</em> at the end is implied. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --ignore-missing | |
| </dt> | |
| <dd> | |
| <p> | |
| Upon seeing an invalid object name in the input, pretend as if | |
| the bad input was not given. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --bisect | |
| </dt> | |
| <dd> | |
| <p> | |
| Pretend as if the bad bisection ref <tt>refs/bisect/bad</tt> | |
| was listed and as if it was followed by <tt>--not</tt> and the good | |
| bisection refs <tt>refs/bisect/good-*</tt> on the command | |
| line. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --stdin | |
| </dt> | |
| <dd> | |
| <p> | |
| In addition to the <em><commit></em> listed on the command | |
| line, read them from the standard input. If a <em>--</em> separator is | |
| seen, stop reading commits and start reading paths to limit the | |
| result. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --cherry-mark | |
| </dt> | |
| <dd> | |
| <p> | |
| Like <tt>--cherry-pick</tt> (see below) but mark equivalent commits | |
| with <tt>=</tt> rather than omitting them, and inequivalent ones with <tt>+</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --cherry-pick | |
| </dt> | |
| <dd> | |
| <p> | |
| Omit any commit that introduces the same change as | |
| another commit on the "other side" when the set of | |
| commits are limited with symmetric difference. | |
| </p> | |
| <div class="paragraph"><p>For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way | |
| to list all commits on only one side of them is with | |
| <tt>--left-right</tt> (see the example below in the description of | |
| the <tt>--left-right</tt> option). It however shows the commits that were cherry-picked | |
| from the other branch (for example, "3rd on b" may be cherry-picked | |
| from branch A). With this option, such pairs of commits are | |
| excluded from the output.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --left-only | |
| </dt> | |
| <dt class="hdlist1"> | |
| --right-only | |
| </dt> | |
| <dd> | |
| <p> | |
| List only commits on the respective side of a symmetric range, | |
| i.e. only those which would be marked <tt><</tt> resp. <tt>></tt> by | |
| <tt>--left-right</tt>. | |
| </p> | |
| <div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A...B</tt> omits those | |
| commits from <tt>B</tt> which are in <tt>A</tt> or are patch-equivalent to a commit in | |
| <tt>A</tt>. In other words, this lists the <tt>+</tt> commits from <tt>git cherry A B</tt>. | |
| More precisely, <tt>--cherry-pick --right-only --no-merges</tt> gives the exact | |
| list.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --cherry | |
| </dt> | |
| <dd> | |
| <p> | |
| A synonym for <tt>--right-only --cherry-mark --no-merges</tt>; useful to | |
| limit the output to the commits on our side and mark those that | |
| have been applied to the other side of a forked history with | |
| <tt>git log --cherry upstream...mybranch</tt>, similar to | |
| <tt>git cherry upstream mybranch</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -g | |
| </dt> | |
| <dt class="hdlist1"> | |
| --walk-reflogs | |
| </dt> | |
| <dd> | |
| <p> | |
| Instead of walking the commit ancestry chain, walk | |
| reflog entries from the most recent one to older ones. | |
| When this option is used you cannot specify commits to | |
| exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>, | |
| nor <em>commit1...commit2</em> notations cannot be used). | |
| </p> | |
| <div class="paragraph"><p>With <em>--pretty</em> format other than oneline (for obvious reasons), | |
| this causes the output to have two extra lines of information | |
| taken from the reflog. By default, <em>commit@{Nth}</em> notation is | |
| used in the output. When the starting commit is specified as | |
| <em>commit@{now}</em>, output also uses <em>commit@{timestamp}</em> notation | |
| instead. Under <em>--pretty=oneline</em>, the commit message is | |
| prefixed with this information on the same line. | |
| This option cannot be combined with <em>--reverse</em>. | |
| See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --merge | |
| </dt> | |
| <dd> | |
| <p> | |
| After a failed merge, show refs that touch files having a | |
| conflict and don’t exist on all heads to merge. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --boundary | |
| </dt> | |
| <dd> | |
| <p> | |
| Output uninteresting commits at the boundary, which are usually | |
| not shown. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <h3 id="_history_simplification">History Simplification</h3><div style="clear:left"></div> | |
| <div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the | |
| commits modifying a particular <path>. But there are two parts of | |
| <em>History Simplification</em>, one part is selecting the commits and the other | |
| is how to do it, as there are various strategies to simplify the history.</p></div> | |
| <div class="paragraph"><p>The following options select the commits to be shown:</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| <paths> | |
| </dt> | |
| <dd> | |
| <p> | |
| Commits modifying the given <paths> are selected. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --simplify-by-decoration | |
| </dt> | |
| <dd> | |
| <p> | |
| Commits that are referred by some branch or tag are selected. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>Note that extra commits can be shown to give a meaningful history.</p></div> | |
| <div class="paragraph"><p>The following options affect the way the simplification is performed:</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| Default mode | |
| </dt> | |
| <dd> | |
| <p> | |
| Simplifies the history to the simplest history explaining the | |
| final state of the tree. Simplest because it prunes some side | |
| branches if the end result is the same (i.e. merging branches | |
| with the same content) | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --full-history | |
| </dt> | |
| <dd> | |
| <p> | |
| Same as the default mode, but does not prune some history. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --dense | |
| </dt> | |
| <dd> | |
| <p> | |
| Only the selected commits are shown, plus some to have a | |
| meaningful history. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --sparse | |
| </dt> | |
| <dd> | |
| <p> | |
| All commits in the simplified history are shown. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --simplify-merges | |
| </dt> | |
| <dd> | |
| <p> | |
| Additional option to <em>--full-history</em> to remove some needless | |
| merges from the resulting history, as there are no selected | |
| commits contributing to this merge. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --ancestry-path | |
| </dt> | |
| <dd> | |
| <p> | |
| When given a range of commits to display (e.g. <em>commit1..commit2</em> | |
| or <em>commit2 ^commit1</em>), only display commits that exist | |
| directly on the ancestry chain between the <em>commit1</em> and | |
| <em>commit2</em>, i.e. commits that are both descendants of <em>commit1</em>, | |
| and ancestors of <em>commit2</em>. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>A more detailed explanation follows.</p></div> | |
| <div class="paragraph"><p>Suppose you specified <tt>foo</tt> as the <paths>. We shall call commits | |
| that modify <tt>foo</tt> !TREESAME, and the rest TREESAME. (In a diff | |
| filtered for <tt>foo</tt>, they look different and equal, respectively.)</p></div> | |
| <div class="paragraph"><p>In the following, we will always refer to the same example history to | |
| illustrate the differences between simplification settings. We assume | |
| that you are filtering for a file <tt>foo</tt> in this commit graph:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> .-A---M---N---O---P | |
| / / / / / | |
| I B C D E | |
| \ / / / / | |
| `-------------'</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>The horizontal line of history A---P is taken to be the first parent of | |
| each merge. The commits are:</p></div> | |
| <div class="ulist"><ul> | |
| <li> | |
| <p> | |
| <tt>I</tt> is the initial commit, in which <tt>foo</tt> exists with contents | |
| "asdf", and a file <tt>quux</tt> exists with contents "quux". Initial | |
| commits are compared to an empty tree, so <tt>I</tt> is !TREESAME. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| In <tt>A</tt>, <tt>foo</tt> contains just "foo". | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <tt>B</tt> contains the same change as <tt>A</tt>. Its merge <tt>M</tt> is trivial and | |
| hence TREESAME to all parents. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <tt>C</tt> does not change <tt>foo</tt>, but its merge <tt>N</tt> changes it to "foobar", | |
| so it is not TREESAME to any parent. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <tt>D</tt> sets <tt>foo</tt> to "baz". Its merge <tt>O</tt> combines the strings from | |
| <tt>N</tt> and <tt>D</tt> to "foobarbaz"; i.e., it is not TREESAME to any parent. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <tt>E</tt> changes <tt>quux</tt> to "xyzzy", and its merge <tt>P</tt> combines the | |
| strings to "quux xyzzy". Despite appearing interesting, <tt>P</tt> is | |
| TREESAME to all parents. | |
| </p> | |
| </li> | |
| </ul></div> | |
| <div class="paragraph"><p><em>rev-list</em> walks backwards through history, including or excluding | |
| commits based on whether <em>--full-history</em> and/or parent rewriting | |
| (via <em>--parents</em> or <em>--children</em>) are used. The following settings | |
| are available.</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| Default mode | |
| </dt> | |
| <dd> | |
| <p> | |
| Commits are included if they are not TREESAME to any parent | |
| (though this can be changed, see <em>--sparse</em> below). If the | |
| commit was a merge, and it was TREESAME to one parent, follow | |
| only that parent. (Even if there are several TREESAME | |
| parents, follow only one of them.) Otherwise, follow all | |
| parents. | |
| </p> | |
| <div class="paragraph"><p>This results in:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> .-A---N---O | |
| / / / | |
| I---------D</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>Note how the rule to only follow the TREESAME parent, if one is | |
| available, removed <tt>B</tt> from consideration entirely. <tt>C</tt> was | |
| considered via <tt>N</tt>, but is TREESAME. Root commits are compared to an | |
| empty tree, so <tt>I</tt> is !TREESAME.</p></div> | |
| <div class="paragraph"><p>Parent/child relations are only visible with --parents, but that does | |
| not affect the commits selected in default mode, so we have shown the | |
| parent lines.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --full-history without parent rewriting | |
| </dt> | |
| <dd> | |
| <p> | |
| This mode differs from the default in one point: always follow | |
| all parents of a merge, even if it is TREESAME to one of them. | |
| Even if more than one side of the merge has commits that are | |
| included, this does not imply that the merge itself is! In | |
| the example, we get | |
| </p> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> I A B N D O</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p><tt>P</tt> and <tt>M</tt> were excluded because they are TREESAME to a parent. <tt>E</tt>, | |
| <tt>C</tt> and <tt>B</tt> were all walked, but only <tt>B</tt> was !TREESAME, so the others | |
| do not appear.</p></div> | |
| <div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk | |
| about the parent/child relationships between the commits, so we show | |
| them disconnected.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --full-history with parent rewriting | |
| </dt> | |
| <dd> | |
| <p> | |
| Ordinary commits are only included if they are !TREESAME | |
| (though this can be changed, see <em>--sparse</em> below). | |
| </p> | |
| <div class="paragraph"><p>Merges are always included. However, their parent list is rewritten: | |
| Along each parent, prune away commits that are not included | |
| themselves. This results in</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> .-A---M---N---O---P | |
| / / / / / | |
| I B / D / | |
| \ / / / / | |
| `-------------'</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt> | |
| was pruned away because it is TREESAME, but the parent list of P was | |
| rewritten to contain <tt>E</tt>'s parent <tt>I</tt>. The same happened for <tt>C</tt> and | |
| <tt>N</tt>. Note also that <tt>P</tt> was included despite being TREESAME.</p></div> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>In addition to the above settings, you can change whether TREESAME | |
| affects inclusion:</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| --dense | |
| </dt> | |
| <dd> | |
| <p> | |
| Commits that are walked are included if they are not TREESAME | |
| to any parent. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --sparse | |
| </dt> | |
| <dd> | |
| <p> | |
| All commits that are walked are included. | |
| </p> | |
| <div class="paragraph"><p>Note that without <em>--full-history</em>, this still simplifies merges: if | |
| one of the parents is TREESAME, we follow only that one, so the other | |
| sides of the merge are never walked.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --simplify-merges | |
| </dt> | |
| <dd> | |
| <p> | |
| First, build a history graph in the same way that | |
| <em>--full-history</em> with parent rewriting does (see above). | |
| </p> | |
| <div class="paragraph"><p>Then simplify each commit <tt>C</tt> to its replacement <tt>C'</tt> in the final | |
| history according to the following rules:</p></div> | |
| <div class="ulist"><ul> | |
| <li> | |
| <p> | |
| Set <tt>C'</tt> to <tt>C</tt>. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| Replace each parent <tt>P</tt> of <tt>C'</tt> with its simplification <tt>P'</tt>. In | |
| the process, drop parents that are ancestors of other parents, and | |
| remove duplicates. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has | |
| zero or >1 parents), a boundary commit, or !TREESAME, it remains. | |
| Otherwise, it is replaced with its only parent. | |
| </p> | |
| </li> | |
| </ul></div> | |
| <div class="paragraph"><p>The effect of this is best shown by way of comparing to | |
| <em>--full-history</em> with parent rewriting. The example turns into:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> .-A---M---N---O | |
| / / / | |
| I B D | |
| \ / / | |
| `---------'</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div> | |
| <div class="ulist"><ul> | |
| <li> | |
| <p> | |
| <tt>N</tt>'s parent list had <tt>I</tt> removed, because it is an ancestor of the | |
| other parent <tt>M</tt>. Still, <tt>N</tt> remained because it is !TREESAME. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <tt>P</tt>'s parent list similarly had <tt>I</tt> removed. <tt>P</tt> was then | |
| removed completely, because it had one parent and is TREESAME. | |
| </p> | |
| </li> | |
| </ul></div> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>Finally, there is a fifth simplification mode available:</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| --ancestry-path | |
| </dt> | |
| <dd> | |
| <p> | |
| Limit the displayed commits to those directly on the ancestry | |
| chain between the "from" and "to" commits in the given commit | |
| range. I.e. only display commits that are ancestor of the "to" | |
| commit, and descendants of the "from" commit. | |
| </p> | |
| <div class="paragraph"><p>As an example use case, consider the following commit history:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> D---E-------F | |
| / \ \ | |
| B---C---G---H---I---J | |
| / \ | |
| A-------K---------------L--M</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <tt>M</tt>, | |
| but excludes the ones that are ancestors of <tt>D</tt>. This is useful to see | |
| what happened to the history leading to <tt>M</tt> since <tt>D</tt>, in the sense | |
| that "what does <tt>M</tt> have that did not exist in <tt>D</tt>". The result in this | |
| example would be all the commits, except <tt>A</tt> and <tt>B</tt> (and <tt>D</tt> itself, | |
| of course).</p></div> | |
| <div class="paragraph"><p>When we want to find out what commits in <tt>M</tt> are contaminated with the | |
| bug introduced by <tt>D</tt> and need fixing, however, we might want to view | |
| only the subset of <em>D..M</em> that are actually descendants of <tt>D</tt>, i.e. | |
| excluding <tt>C</tt> and <tt>K</tt>. This is exactly what the <em>--ancestry-path</em> | |
| option does. Applied to the <em>D..M</em> range, it results in:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> E-------F | |
| \ \ | |
| G---H---I---J | |
| \ | |
| L--M</tt></pre> | |
| </div></div> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>The <em>--simplify-by-decoration</em> option allows you to view only the | |
| big picture of the topology of the history, by omitting commits | |
| that are not referenced by tags. Commits are marked as !TREESAME | |
| (in other words, kept after history simplification rules described | |
| above) if (1) they are referenced by tags, or (2) they change the | |
| contents of the paths given on the command line. All other | |
| commits are marked as TREESAME (subject to be simplified away).</p></div> | |
| <h3 id="_commit_ordering">Commit Ordering</h3><div style="clear:left"></div> | |
| <div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| --topo-order | |
| </dt> | |
| <dd> | |
| <p> | |
| This option makes them appear in topological order (i.e. | |
| descendant commits are shown before their parents). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --date-order | |
| </dt> | |
| <dd> | |
| <p> | |
| This option is similar to <em>--topo-order</em> in the sense that no | |
| parent comes before all of its children, but otherwise things | |
| are still ordered in the commit timestamp order. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --reverse | |
| </dt> | |
| <dd> | |
| <p> | |
| Output the commits in reverse order. | |
| Cannot be combined with <em>--walk-reflogs</em>. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <h3 id="_object_traversal">Object Traversal</h3><div style="clear:left"></div> | |
| <div class="paragraph"><p>These options are mostly targeted for packing of git repositories.</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| --objects | |
| </dt> | |
| <dd> | |
| <p> | |
| Print the object IDs of any object referenced by the listed | |
| commits. <em>--objects foo ^bar</em> thus means "send me | |
| all object IDs which I need to download if I have the commit | |
| object <em>bar</em>, but not <em>foo</em>". | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --objects-edge | |
| </dt> | |
| <dd> | |
| <p> | |
| Similar to <em>--objects</em>, but also print the IDs of excluded | |
| commits prefixed with a "-" character. This is used by | |
| <a href="git-pack-objects.html">git-pack-objects(1)</a> to build "thin" pack, which records | |
| objects in deltified form based on objects contained in these | |
| excluded commits to reduce network traffic. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --unpacked | |
| </dt> | |
| <dd> | |
| <p> | |
| Only useful with <em>--objects</em>; print the object IDs that are not | |
| in packs. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-walk | |
| </dt> | |
| <dd> | |
| <p> | |
| Only show the given revs, but do not traverse their ancestors. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --do-walk | |
| </dt> | |
| <dd> | |
| <p> | |
| Overrides a previous --no-walk. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| --pretty[=<format>] | |
| </dt> | |
| <dt class="hdlist1"> | |
| --format=<format> | |
| </dt> | |
| <dd> | |
| <p> | |
| Pretty-print the contents of the commit logs in a given format, | |
| where <em><format></em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>, | |
| <em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:<string></em>. See | |
| the "PRETTY FORMATS" section for some additional details for each | |
| format. When omitted, the format defaults to <em>medium</em>. | |
| </p> | |
| <div class="paragraph"><p>Note: you can specify the default pretty format in the repository | |
| configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --abbrev-commit | |
| </dt> | |
| <dd> | |
| <p> | |
| Instead of showing the full 40-byte hexadecimal commit object | |
| name, show only a partial prefix. Non default number of | |
| digits can be specified with "--abbrev=<n>" (which also modifies | |
| diff output, if it is displayed). | |
| </p> | |
| <div class="paragraph"><p>This should make "--pretty=oneline" a whole lot more readable for | |
| people using 80-column terminals.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-abbrev-commit | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the full 40-byte hexadecimal commit object name. This negates | |
| <tt>--abbrev-commit</tt> and those options which imply it such as | |
| "--oneline". It also overrides the <em>log.abbrevCommit</em> variable. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --oneline | |
| </dt> | |
| <dd> | |
| <p> | |
| This is a shorthand for "--pretty=oneline --abbrev-commit" | |
| used together. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --encoding[=<encoding>] | |
| </dt> | |
| <dd> | |
| <p> | |
| The commit objects record the encoding used for the log message | |
| in their encoding header; this option can be used to tell the | |
| command to re-code the commit log message in the encoding | |
| preferred by the user. For non plumbing commands this | |
| defaults to UTF-8. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --notes[=<ref>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the | |
| commit, when showing the commit log message. This is the default | |
| for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when | |
| there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given | |
| on the command line. | |
| </p> | |
| <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the | |
| <em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding | |
| environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div> | |
| <div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the | |
| default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it | |
| is not qualified.</p></div> | |
| <div class="paragraph"><p>Multiple --notes options can be combined to control which notes are | |
| being displayed. Examples: "--notes=foo" will show only notes from | |
| "refs/notes/foo"; "--notes=foo --notes" will show both notes from | |
| "refs/notes/foo" and from the default notes ref(s).</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-notes | |
| </dt> | |
| <dd> | |
| <p> | |
| Do not show notes. This negates the above <tt>--notes</tt> option, by | |
| resetting the list of notes refs from which notes are shown. | |
| Options are parsed in the order given on the command line, so e.g. | |
| "--notes --notes=foo --no-notes --notes=bar" will only show notes | |
| from "refs/notes/bar". | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --show-notes[=<ref>] | |
| </dt> | |
| <dt class="hdlist1"> | |
| --[no-]standard-notes | |
| </dt> | |
| <dd> | |
| <p> | |
| These options are deprecated. Use the above --notes/--no-notes | |
| options instead. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --relative-date | |
| </dt> | |
| <dd> | |
| <p> | |
| Synonym for <tt>--date=relative</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --date=(relative|local|default|iso|rfc|short|raw) | |
| </dt> | |
| <dd> | |
| <p> | |
| Only takes effect for dates shown in human-readable format, such | |
| as when using "--pretty". <tt>log.date</tt> config variable sets a default | |
| value for log command’s --date option. | |
| </p> | |
| <div class="paragraph"><p><tt>--date=relative</tt> shows dates relative to the current time, | |
| e.g. "2 hours ago".</p></div> | |
| <div class="paragraph"><p><tt>--date=local</tt> shows timestamps in user’s local timezone.</p></div> | |
| <div class="paragraph"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div> | |
| <div class="paragraph"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822 | |
| format, often found in E-mail messages.</p></div> | |
| <div class="paragraph"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div> | |
| <div class="paragraph"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div> | |
| <div class="paragraph"><p><tt>--date=default</tt> shows timestamps in the original timezone | |
| (either committer’s or author’s).</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --parents | |
| </dt> | |
| <dd> | |
| <p> | |
| Print also the parents of the commit (in the form "commit parent…"). | |
| Also enables parent rewriting, see <em>History Simplification</em> below. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --children | |
| </dt> | |
| <dd> | |
| <p> | |
| Print also the children of the commit (in the form "commit child…"). | |
| Also enables parent rewriting, see <em>History Simplification</em> below. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --left-right | |
| </dt> | |
| <dd> | |
| <p> | |
| Mark which side of a symmetric diff a commit is reachable from. | |
| Commits from the left side are prefixed with <tt><</tt> and those from | |
| the right with <tt>></tt>. If combined with <tt>--boundary</tt>, those | |
| commits are prefixed with <tt>-</tt>. | |
| </p> | |
| <div class="paragraph"><p>For example, if you have this topology:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> y---b---b branch B | |
| / \ / | |
| / . | |
| / / \ | |
| o---x---a---a branch A</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>you would get an output like this:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B | |
| >bbbbbbb... 3rd on b | |
| >bbbbbbb... 2nd on b | |
| <aaaaaaa... 3rd on a | |
| <aaaaaaa... 2nd on a | |
| -yyyyyyy... 1st on b | |
| -xxxxxxx... 1st on a</tt></pre> | |
| </div></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --graph | |
| </dt> | |
| <dd> | |
| <p> | |
| Draw a text-based graphical representation of the commit history | |
| on the left hand side of the output. This may cause extra lines | |
| to be printed in between commits, in order for the graph history | |
| to be drawn properly. | |
| </p> | |
| <div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div> | |
| <div class="paragraph"><p>This implies the <em>--topo-order</em> option by default, but the | |
| <em>--date-order</em> option may also be specified.</p></div> | |
| </dd> | |
| </dl></div> | |
| <h3 id="_diff_formatting">Diff Formatting</h3><div style="clear:left"></div> | |
| <div class="paragraph"><p>Below are listed options that control the formatting of diff output. | |
| Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff | |
| options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| -c | |
| </dt> | |
| <dd> | |
| <p> | |
| With this option, diff output for a merge commit | |
| shows the differences from each of the parents to the merge result | |
| simultaneously instead of showing pairwise diff between a parent | |
| and the result one at a time. Furthermore, it lists only files | |
| which were modified from all parents. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --cc | |
| </dt> | |
| <dd> | |
| <p> | |
| This flag implies the <em>-c</em> options and further compresses the | |
| patch output by omitting uninteresting hunks whose contents in | |
| the parents have only two variants and the merge result picks | |
| one of them without modification. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -m | |
| </dt> | |
| <dd> | |
| <p> | |
| This flag makes the merge commits show the full diff like | |
| regular commits; for each merge parent, a separate log entry | |
| and diff is generated. An exception is that only diff against | |
| the first parent is shown when <em>--first-parent</em> option is given; | |
| in that case, the output represents the changes the merge | |
| brought <em>into</em> the then-current branch. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -r | |
| </dt> | |
| <dd> | |
| <p> | |
| Show recursive diffs. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -t | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the tree objects in the diff output. This implies <em>-r</em>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -s | |
| </dt> | |
| <dd> | |
| <p> | |
| Suppress diff output. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| </div> | |
| <h2 id="_pretty_formats">PRETTY FORMATS</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>If the commit is a merge, and if the pretty-format | |
| is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is | |
| inserted before the <em>Author:</em> line. This line begins with | |
| "Merge: " and the sha1s of ancestral commits are printed, | |
| separated by spaces. Note that the listed commits may not | |
| necessarily be the list of the <strong>direct</strong> parent commits if you | |
| have limited your view of history: for example, if you are | |
| only interested in changes related to a certain directory or | |
| file.</p></div> | |
| <div class="paragraph"><p>There are several built-in formats, and you can define | |
| additional formats by setting a pretty.<name> | |
| config option to either another format name, or a | |
| <em>format:</em> string, as described below (see | |
| <a href="git-config.html">git-config(1)</a>). Here are the details of the | |
| built-in formats:</p></div> | |
| <div class="ulist"><ul> | |
| <li> | |
| <p> | |
| <em>oneline</em> | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><sha1> <title line></tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>This is designed to be as compact as possible.</p></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>short</em> | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>commit <sha1> | |
| Author: <author></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><title line></tt></pre> | |
| </div></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>medium</em> | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>commit <sha1> | |
| Author: <author> | |
| Date: <author date></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><title line></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><full commit message></tt></pre> | |
| </div></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>full</em> | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>commit <sha1> | |
| Author: <author> | |
| Commit: <committer></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><title line></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><full commit message></tt></pre> | |
| </div></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>fuller</em> | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>commit <sha1> | |
| Author: <author> | |
| AuthorDate: <author date> | |
| Commit: <committer> | |
| CommitDate: <committer date></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><title line></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><full commit message></tt></pre> | |
| </div></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>email</em> | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>From <sha1> <date> | |
| From: <author> | |
| Date: <author date> | |
| Subject: [PATCH] <title line></tt></pre> | |
| </div></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt><full commit message></tt></pre> | |
| </div></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>raw</em> | |
| </p> | |
| <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as | |
| stored in the commit object. Notably, the SHA1s are | |
| displayed in full, regardless of whether --abbrev or | |
| --no-abbrev are used, and <em>parents</em> information show the | |
| true parent commits, without taking grafts nor history | |
| simplification into account.</p></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>format:<string></em> | |
| </p> | |
| <div class="paragraph"><p>The <em>format:<string></em> format allows you to specify which information | |
| you want to show. It works a little bit like printf format, | |
| with the notable exception that you get a newline with <em>%n</em> | |
| instead of <em>\n</em>.</p></div> | |
| <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em> | |
| would show something like this:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago | |
| The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>The placeholders are:</p></div> | |
| <div class="ulist"><ul> | |
| <li> | |
| <p> | |
| <em>%H</em>: commit hash | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%h</em>: abbreviated commit hash | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%T</em>: tree hash | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%t</em>: abbreviated tree hash | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%P</em>: parent hashes | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%p</em>: abbreviated parent hashes | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%an</em>: author name | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <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>) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ae</em>: author email | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <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>) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ad</em>: author date (format respects --date= option) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%aD</em>: author date, RFC2822 style | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ar</em>: author date, relative | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%at</em>: author date, UNIX timestamp | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ai</em>: author date, ISO 8601 format | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%cn</em>: committer name | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <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>) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ce</em>: committer email | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <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>) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%cd</em>: committer date | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%cD</em>: committer date, RFC2822 style | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%cr</em>: committer date, relative | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ct</em>: committer date, UNIX timestamp | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ci</em>: committer date, ISO 8601 format | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%d</em>: ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a> | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%e</em>: encoding | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%s</em>: subject | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%f</em>: sanitized subject line, suitable for a filename | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%b</em>: body | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%B</em>: raw body (unwrapped subject and body) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%N</em>: commit notes | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt> | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt> | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%gn</em>: reflog identity name | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%gN</em>: reflog identity name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%ge</em>: reflog identity email | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%gE</em>: reflog identity email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>) | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%gs</em>: reflog subject | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%Cred</em>: switch color to red | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%Cgreen</em>: switch color to green | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%Cblue</em>: switch color to blue | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%Creset</em>: reset color | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%C(…)</em>: color specification, as described in color.branch.* config option | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%m</em>: left, right or boundary mark | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%n</em>: newline | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%%</em>: a raw <em>%</em> | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%x00</em>: print a byte from a hex code | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| <em>%w([<w>[,<i1>[,<i2>]]])</em>: switch line wrapping, like the -w option of | |
| <a href="git-shortlog.html">git-shortlog(1)</a>. | |
| </p> | |
| </li> | |
| </ul></div> | |
| </li> | |
| </ul></div> | |
| <div class="admonitionblock"> | |
| <table><tr> | |
| <td class="icon"> | |
| <div class="title">Note</div> | |
| </td> | |
| <td class="content">Some placeholders may depend on other options given to the | |
| revision traversal engine. For example, the <tt>%g*</tt> reflog options will | |
| insert an empty string unless we are traversing reflog entries (e.g., by | |
| <tt>git log -g</tt>). The <tt>%d</tt> placeholder will use the "short" decoration | |
| format if <tt>--decorate</tt> was not already provided on the command line.</td> | |
| </tr></table> | |
| </div> | |
| <div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed | |
| is inserted immediately before the expansion if and only if the | |
| placeholder expands to a non-empty string.</p></div> | |
| <div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that | |
| immediately precede the expansion are deleted if and only if the | |
| placeholder expands to an empty string.</p></div> | |
| <div class="paragraph"><p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space | |
| is inserted immediately before the expansion if and only if the | |
| placeholder expands to a non-empty string.</p></div> | |
| <div class="ulist"><ul> | |
| <li> | |
| <p> | |
| <em>tformat:</em> | |
| </p> | |
| <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it | |
| provides "terminator" semantics instead of "separator" semantics. In | |
| other words, each commit has the message terminator character (usually a | |
| newline) appended, rather than a separator placed between entries. | |
| This means that the final entry of a single-line format will be properly | |
| terminated with a new line, just as the "oneline" format does. | |
| For example:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt>$ git log -2 --pretty=format:%h 4da45bef \ | |
| | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/' | |
| 4da45be | |
| 7134973 -- NO NEWLINE | |
| $ git log -2 --pretty=tformat:%h 4da45bef \ | |
| | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/' | |
| 4da45be | |
| 7134973</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted | |
| as if it has <tt>tformat:</tt> in front of it. For example, these two are | |
| equivalent:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef | |
| $ git log -2 --pretty=%h 4da45bef</tt></pre> | |
| </div></div> | |
| </li> | |
| </ul></div> | |
| </div> | |
| <h2 id="_common_diff_options">Common diff options</h2> | |
| <div class="sectionbody"> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| -p | |
| </dt> | |
| <dt class="hdlist1"> | |
| -u | |
| </dt> | |
| <dt class="hdlist1"> | |
| --patch | |
| </dt> | |
| <dd> | |
| <p> | |
| Generate patch (see section on generating patches). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -U<n> | |
| </dt> | |
| <dt class="hdlist1"> | |
| --unified=<n> | |
| </dt> | |
| <dd> | |
| <p> | |
| Generate diffs with <n> lines of context instead of | |
| the usual three. | |
| Implies <tt>-p</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --raw | |
| </dt> | |
| <dd> | |
| <p> | |
| Generate the raw format. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --patch-with-raw | |
| </dt> | |
| <dd> | |
| <p> | |
| Synonym for <tt>-p --raw</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --minimal | |
| </dt> | |
| <dd> | |
| <p> | |
| Spend extra time to make sure the smallest possible | |
| diff is produced. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --patience | |
| </dt> | |
| <dd> | |
| <p> | |
| Generate a diff using the "patience diff" algorithm. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --histogram | |
| </dt> | |
| <dd> | |
| <p> | |
| Generate a diff using the "histogram diff" algorithm. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --stat[=<width>[,<name-width>[,<count>]]] | |
| </dt> | |
| <dd> | |
| <p> | |
| Generate a diffstat. By default, as much space as necessary | |
| will be used for the filename part, and the rest for the graph | |
| part. Maximum width defaults to terminal width, or 80 columns | |
| if not connected to a terminal, and can be overriden by | |
| <tt><width></tt>. The width of the filename part can be limited by | |
| giving another width <tt><name-width></tt> after a comma. The width | |
| of the graph part can be limited by using | |
| <tt>--stat-graph-width=<width></tt> (affects all commands generating | |
| a stat graph) or by setting <tt>diff.statGraphWidth=<width></tt> | |
| (does not affect <tt>git format-patch</tt>). | |
| By giving a third parameter <tt><count></tt>, you can limit the | |
| output to the first <tt><count></tt> lines, followed by <tt>...</tt> if | |
| there are more. | |
| </p> | |
| <div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>, | |
| <tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --numstat | |
| </dt> | |
| <dd> | |
| <p> | |
| Similar to <tt>--stat</tt>, but shows number of added and | |
| deleted lines in decimal notation and pathname without | |
| abbreviation, to make it more machine friendly. For | |
| binary files, outputs two <tt>-</tt> instead of saying | |
| <tt>0 0</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --shortstat | |
| </dt> | |
| <dd> | |
| <p> | |
| Output only the last line of the <tt>--stat</tt> format containing total | |
| number of modified files, as well as number of added and deleted | |
| lines. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --dirstat[=<param1,param2,…>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Output the distribution of relative amount of changes for each | |
| sub-directory. The behavior of <tt>--dirstat</tt> can be customized by | |
| passing it a comma separated list of parameters. | |
| The defaults are controlled by the <tt>diff.dirstat</tt> configuration | |
| variable (see <a href="git-config.html">git-config(1)</a>). | |
| The following parameters are available: | |
| </p> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| <tt>changes</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Compute the dirstat numbers by counting the lines that have been | |
| removed from the source, or added to the destination. This ignores | |
| the amount of pure code movements within a file. In other words, | |
| rearranging lines in a file is not counted as much as other changes. | |
| This is the default behavior when no parameter is given. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>lines</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Compute the dirstat numbers by doing the regular line-based diff | |
| analysis, and summing the removed/added line counts. (For binary | |
| files, count 64-byte chunks instead, since binary files have no | |
| natural concept of lines). This is a more expensive <tt>--dirstat</tt> | |
| behavior than the <tt>changes</tt> behavior, but it does count rearranged | |
| lines within a file as much as other changes. The resulting output | |
| is consistent with what you get from the other <tt>--*stat</tt> options. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>files</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Compute the dirstat numbers by counting the number of files changed. | |
| Each changed file counts equally in the dirstat analysis. This is | |
| the computationally cheapest <tt>--dirstat</tt> behavior, since it does | |
| not have to look at the file contents at all. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>cumulative</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Count changes in a child directory for the parent directory as well. | |
| Note that when using <tt>cumulative</tt>, the sum of the percentages | |
| reported may exceed 100%. The default (non-cumulative) behavior can | |
| be specified with the <tt>noncumulative</tt> parameter. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <limit> | |
| </dt> | |
| <dd> | |
| <p> | |
| An integer parameter specifies a cut-off percent (3% by default). | |
| Directories contributing less than this percentage of the changes | |
| are not shown in the output. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>Example: The following will count changed files, while ignoring | |
| directories with less than 10% of the total amount of changed files, | |
| and accumulating child directory counts in the parent directories: | |
| <tt>--dirstat=files,10,cumulative</tt>.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --summary | |
| </dt> | |
| <dd> | |
| <p> | |
| Output a condensed summary of extended header information | |
| such as creations, renames and mode changes. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --patch-with-stat | |
| </dt> | |
| <dd> | |
| <p> | |
| Synonym for <tt>-p --stat</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -z | |
| </dt> | |
| <dd> | |
| <p> | |
| Separate the commits with NULs instead of with new newlines. | |
| </p> | |
| <div class="paragraph"><p>Also, when <tt>--raw</tt> or <tt>--numstat</tt> has been given, do not munge | |
| pathnames and use NULs as output field terminators.</p></div> | |
| <div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes, | |
| and backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt>, and <tt>\\</tt>, | |
| respectively, and the pathname will be enclosed in double quotes if | |
| any of those replacements occurred.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --name-only | |
| </dt> | |
| <dd> | |
| <p> | |
| Show only names of changed files. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --name-status | |
| </dt> | |
| <dd> | |
| <p> | |
| Show only names and status of changed files. See the description | |
| of the <tt>--diff-filter</tt> option on what the status letters mean. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --submodule[=<format>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Specify how differences in submodules are shown. When <tt>--submodule</tt> | |
| or <tt>--submodule=log</tt> is given, the <em>log</em> format is used. This format lists | |
| the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <tt>summary</tt> does. | |
| Omitting the <tt>--submodule</tt> option or specifying <tt>--submodule=short</tt>, | |
| uses the <em>short</em> format. This format just shows the names of the commits | |
| at the beginning and end of the range. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --color[=<when>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Show colored diff. | |
| The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>. | |
| The default value is <tt>never</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-color | |
| </dt> | |
| <dd> | |
| <p> | |
| Turn off colored diff. | |
| It is the same as <tt>--color=never</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --word-diff[=<mode>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Show a word diff, using the <mode> to delimit changed words. | |
| By default, words are delimited by whitespace; see | |
| <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and | |
| must be one of: | |
| </p> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| color | |
| </dt> | |
| <dd> | |
| <p> | |
| Highlight changed words using only colors. Implies <tt>--color</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| plain | |
| </dt> | |
| <dd> | |
| <p> | |
| Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no | |
| attempts to escape the delimiters if they appear in the input, | |
| so the output may be ambiguous. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| porcelain | |
| </dt> | |
| <dd> | |
| <p> | |
| Use a special line-based format intended for script | |
| consumption. Added/removed/unchanged runs are printed in the | |
| usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` ` | |
| character at the beginning of the line and extending to the | |
| end of the line. Newlines in the input are represented by a | |
| tilde <tt>~</tt> on a line of its own. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| none | |
| </dt> | |
| <dd> | |
| <p> | |
| Disable word diff again. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>Note that despite the name of the first mode, color is used to | |
| highlight the changed parts in all modes if enabled.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --word-diff-regex=<regex> | |
| </dt> | |
| <dd> | |
| <p> | |
| Use <regex> to decide what a word is, instead of considering | |
| runs of non-whitespace to be a word. Also implies | |
| <tt>--word-diff</tt> unless it was already enabled. | |
| </p> | |
| <div class="paragraph"><p>Every non-overlapping match of the | |
| <regex> is considered a word. Anything between these matches is | |
| considered whitespace and ignored(!) for the purposes of finding | |
| differences. You may want to append <tt>|[^[:space:]]</tt> to your regular | |
| expression to make sure that it matches all non-whitespace characters. | |
| A match that contains a newline is silently truncated(!) at the | |
| newline.</p></div> | |
| <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see | |
| <a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly | |
| overrides any diff driver or configuration setting. Diff drivers | |
| override configuration settings.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --color-words[=<regex>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Equivalent to <tt>--word-diff=color</tt> plus (if a regex was | |
| specified) <tt>--word-diff-regex=<regex></tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-renames | |
| </dt> | |
| <dd> | |
| <p> | |
| Turn off rename detection, even when the configuration | |
| file gives the default to do so. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --check | |
| </dt> | |
| <dd> | |
| <p> | |
| Warn if changes introduce whitespace errors. What are | |
| considered whitespace errors is controlled by <tt>core.whitespace</tt> | |
| configuration. By default, trailing whitespaces (including | |
| lines that solely consist of whitespaces) and a space character | |
| that is immediately followed by a tab character inside the | |
| initial indent of the line are considered whitespace errors. | |
| Exits with non-zero status if problems are found. Not compatible | |
| with --exit-code. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --full-index | |
| </dt> | |
| <dd> | |
| <p> | |
| Instead of the first handful of characters, show the full | |
| pre- and post-image blob object names on the "index" | |
| line when generating patch format output. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --binary | |
| </dt> | |
| <dd> | |
| <p> | |
| In addition to <tt>--full-index</tt>, output a binary diff that | |
| can be applied with <tt>git-apply</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --abbrev[=<n>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Instead of showing the full 40-byte hexadecimal object | |
| name in diff-raw format output and diff-tree header | |
| lines, show only a partial prefix. This is | |
| independent of the <tt>--full-index</tt> option above, which controls | |
| the diff-patch output format. Non default number of | |
| digits can be specified with <tt>--abbrev=<n></tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -B[<n>][/<m>] | |
| </dt> | |
| <dt class="hdlist1"> | |
| --break-rewrites[=[<n>][/<m>]] | |
| </dt> | |
| <dd> | |
| <p> | |
| Break complete rewrite changes into pairs of delete and | |
| create. This serves two purposes: | |
| </p> | |
| <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file | |
| not as a series of deletion and insertion mixed together with a very | |
| few lines that happen to match textually as the context, but as a | |
| single deletion of everything old followed by a single insertion of | |
| everything new, and the number <tt>m</tt> controls this aspect of the -B | |
| option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the | |
| original should remain in the result for git to consider it a total | |
| rewrite (i.e. otherwise the resulting patch will be a series of | |
| deletion and insertion mixed together with context lines).</p></div> | |
| <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the | |
| source of a rename (usually -M only considers a file that disappeared | |
| as the source of a rename), and the number <tt>n</tt> controls this aspect of | |
| the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with | |
| addition and deletion compared to 20% or more of the file’s size are | |
| eligible for being picked up as a possible source of a rename to | |
| another file.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -M[<n>] | |
| </dt> | |
| <dt class="hdlist1"> | |
| --find-renames[=<n>] | |
| </dt> | |
| <dd> | |
| <p> | |
| If generating diffs, detect and report renames for each commit. | |
| For following files across renames while traversing history, see | |
| <tt>--follow</tt>. | |
| If <tt>n</tt> is specified, it is a threshold on the similarity | |
| index (i.e. amount of addition/deletions compared to the | |
| file’s size). For example, <tt>-M90%</tt> means git should consider a | |
| delete/add pair to be a rename if more than 90% of the file | |
| hasn’t changed. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -C[<n>] | |
| </dt> | |
| <dt class="hdlist1"> | |
| --find-copies[=<n>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Detect copies as well as renames. See also <tt>--find-copies-harder</tt>. | |
| If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --find-copies-harder | |
| </dt> | |
| <dd> | |
| <p> | |
| For performance reasons, by default, <tt>-C</tt> option finds copies only | |
| if the original file of the copy was modified in the same | |
| changeset. This flag makes the command | |
| inspect unmodified files as candidates for the source of | |
| copy. This is a very expensive operation for large | |
| projects, so use it with caution. Giving more than one | |
| <tt>-C</tt> option has the same effect. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -D | |
| </dt> | |
| <dt class="hdlist1"> | |
| --irreversible-delete | |
| </dt> | |
| <dd> | |
| <p> | |
| Omit the preimage for deletes, i.e. print only the header but not | |
| the diff between the preimage and <tt>/dev/null</tt>. The resulting patch | |
| is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is | |
| solely for people who want to just concentrate on reviewing the | |
| text after the change. In addition, the output obviously lack | |
| enough information to apply such a patch in reverse, even manually, | |
| hence the name of the option. | |
| </p> | |
| <div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part | |
| of a delete/create pair.</p></div> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -l<num> | |
| </dt> | |
| <dd> | |
| <p> | |
| The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n | |
| is the number of potential rename/copy targets. This | |
| option prevents rename/copy detection from running if | |
| the number of rename/copy targets exceeds the specified | |
| number. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]] | |
| </dt> | |
| <dd> | |
| <p> | |
| Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>), | |
| Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their | |
| type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>), | |
| are Unmerged (<tt>U</tt>), are | |
| Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>). | |
| Any combination of the filter characters (including none) can be used. | |
| When <tt>*</tt> (All-or-none) is added to the combination, all | |
| paths are selected if there is any file that matches | |
| other criteria in the comparison; if there is no file | |
| that matches other criteria, nothing is selected. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -S<string> | |
| </dt> | |
| <dd> | |
| <p> | |
| Look for differences that introduce or remove an instance of | |
| <string>. Note that this is different than the string simply | |
| appearing in diff output; see the <em>pickaxe</em> entry in | |
| <a href="gitdiffcore.html">gitdiffcore(7)</a> for more details. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -G<regex> | |
| </dt> | |
| <dd> | |
| <p> | |
| Look for differences whose added or removed line matches | |
| the given <regex>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --pickaxe-all | |
| </dt> | |
| <dd> | |
| <p> | |
| When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that | |
| changeset, not just the files that contain the change | |
| in <string>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --pickaxe-regex | |
| </dt> | |
| <dd> | |
| <p> | |
| Make the <string> not a plain string but an extended POSIX | |
| regex to match. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -O<orderfile> | |
| </dt> | |
| <dd> | |
| <p> | |
| Output the patch in the order specified in the | |
| <orderfile>, which has one shell glob pattern per line. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -R | |
| </dt> | |
| <dd> | |
| <p> | |
| Swap two inputs; that is, show differences from index or | |
| on-disk file to tree contents. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --relative[=<path>] | |
| </dt> | |
| <dd> | |
| <p> | |
| When run from a subdirectory of the project, it can be | |
| told to exclude changes outside the directory and show | |
| pathnames relative to it with this option. When you are | |
| not in a subdirectory (e.g. in a bare repository), you | |
| can name which subdirectory to make the output relative | |
| to by giving a <path> as an argument. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -a | |
| </dt> | |
| <dt class="hdlist1"> | |
| --text | |
| </dt> | |
| <dd> | |
| <p> | |
| Treat all files as text. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --ignore-space-at-eol | |
| </dt> | |
| <dd> | |
| <p> | |
| Ignore changes in whitespace at EOL. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -b | |
| </dt> | |
| <dt class="hdlist1"> | |
| --ignore-space-change | |
| </dt> | |
| <dd> | |
| <p> | |
| Ignore changes in amount of whitespace. This ignores whitespace | |
| at line end, and considers all other sequences of one or | |
| more whitespace characters to be equivalent. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -w | |
| </dt> | |
| <dt class="hdlist1"> | |
| --ignore-all-space | |
| </dt> | |
| <dd> | |
| <p> | |
| Ignore whitespace when comparing lines. This ignores | |
| differences even if one line has whitespace where the other | |
| line has none. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --inter-hunk-context=<lines> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the context between diff hunks, up to the specified number | |
| of lines, thereby fusing hunks that are close to each other. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -W | |
| </dt> | |
| <dt class="hdlist1"> | |
| --function-context | |
| </dt> | |
| <dd> | |
| <p> | |
| Show whole surrounding functions of changes. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --ext-diff | |
| </dt> | |
| <dd> | |
| <p> | |
| Allow an external diff helper to be executed. If you set an | |
| external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need | |
| to use this option with <a href="git-log.html">git-log(1)</a> and friends. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-ext-diff | |
| </dt> | |
| <dd> | |
| <p> | |
| Disallow external diff drivers. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --textconv | |
| </dt> | |
| <dt class="hdlist1"> | |
| --no-textconv | |
| </dt> | |
| <dd> | |
| <p> | |
| Allow (or disallow) external text conversion filters to be run | |
| when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for | |
| details. Because textconv filters are typically a one-way | |
| conversion, the resulting diff is suitable for human | |
| consumption, but cannot be applied. For this reason, textconv | |
| filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and | |
| <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or | |
| diff plumbing commands. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --ignore-submodules[=<when>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Ignore changes to submodules in the diff generation. <when> can be | |
| either "none", "untracked", "dirty" or "all", which is the default | |
| Using "none" will consider the submodule modified when it either contains | |
| untracked or modified files or its HEAD differs from the commit recorded | |
| in the superproject and can be used to override any settings of the | |
| <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When | |
| "untracked" is used submodules are not considered dirty when they only | |
| contain untracked content (but they are still scanned for modified | |
| content). Using "dirty" ignores all changes to the work tree of submodules, | |
| only changes to the commits stored in the superproject are shown (this was | |
| the behavior until 1.7.0). Using "all" hides all changes to submodules. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --src-prefix=<prefix> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the given source prefix instead of "a/". | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --dst-prefix=<prefix> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the given destination prefix instead of "b/". | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-prefix | |
| </dt> | |
| <dd> | |
| <p> | |
| Do not show any source or destination prefix. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>For more detailed explanation on these common options, see also | |
| <a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div> | |
| </div> | |
| <h2 id="_generating_patches_with_p">Generating patches with -p</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run | |
| with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or | |
| "git log" with the "-p" option, they | |
| do not produce the output described above; instead they produce a | |
| patch file. You can customize the creation of such patches via the | |
| GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div> | |
| <div class="paragraph"><p>What the -p option produces is slightly different from the traditional | |
| diff format:</p></div> | |
| <div class="olist arabic"><ol class="arabic"> | |
| <li> | |
| <p> | |
| It is preceded with a "git diff" header that looks like this: | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>diff --git a/file1 b/file2</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is | |
| involved. Especially, even for a creation or a deletion, | |
| <tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div> | |
| <div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the | |
| name of the source file of the rename/copy and the name of | |
| the file that rename/copy produces, respectively.</p></div> | |
| </li> | |
| <li> | |
| <p> | |
| It is followed by one or more extended header lines: | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>old mode <mode> | |
| new mode <mode> | |
| deleted file mode <mode> | |
| new file mode <mode> | |
| copy from <path> | |
| copy to <path> | |
| rename from <path> | |
| rename to <path> | |
| similarity index <number> | |
| dissimilarity index <number> | |
| index <hash>..<hash> <mode></tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type | |
| and file permission bits.</p></div> | |
| <div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div> | |
| <div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and | |
| the dissimilarity index is the percentage of changed lines. It | |
| is a rounded down integer, followed by a percent sign. The | |
| similarity index value of 100% is thus reserved for two equal | |
| files, while 100% dissimilarity means that no line from the old | |
| file made it into the new one.</p></div> | |
| <div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change. | |
| The <mode> is included if the file mode does not change; otherwise, | |
| separate lines indicate the old and the new mode.</p></div> | |
| </li> | |
| <li> | |
| <p> | |
| TAB, LF, double quote and backslash characters in pathnames | |
| are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively. | |
| If there is need for such substitution then the whole | |
| pathname is put in double quotes. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| All the <tt>file1</tt> files in the output refer to files before the | |
| commit, and all the <tt>file2</tt> files refer to files after the commit. | |
| It is incorrect to apply each change to each file sequentially. For | |
| example, this patch will swap a and b: | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>diff --git a/a b/b | |
| rename from a | |
| rename to b | |
| diff --git a/b b/a | |
| rename from b | |
| rename to a</tt></pre> | |
| </div></div> | |
| </li> | |
| </ol></div> | |
| </div> | |
| <h2 id="_combined_diff_format">combined diff format</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to | |
| produce a <em>combined diff</em> when showing a merge. This is the default | |
| format when showing merges with <a href="git-diff.html">git-diff(1)</a> or | |
| <a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any | |
| of these commands to force generation of diffs with individual parents | |
| of a merge.</p></div> | |
| <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt>diff --combined describe.c | |
| index fabadb8,cc95eb0..4866510 | |
| --- a/describe.c | |
| +++ b/describe.c | |
| @@@ -98,20 -98,12 +98,20 @@@ | |
| return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1; | |
| } | |
| - static void describe(char *arg) | |
| -static void describe(struct commit *cmit, int last_one) | |
| ++static void describe(char *arg, int last_one) | |
| { | |
| + unsigned char sha1[20]; | |
| + struct commit *cmit; | |
| struct commit_list *list; | |
| static int initialized = 0; | |
| struct commit_name *n; | |
| + if (get_sha1(arg, sha1) < 0) | |
| + usage(describe_usage); | |
| + cmit = lookup_commit_reference(sha1); | |
| + if (!cmit) | |
| + usage(describe_usage); | |
| + | |
| if (!initialized) { | |
| initialized = 1; | |
| for_each_ref(get_name);</tt></pre> | |
| </div></div> | |
| <div class="olist arabic"><ol class="arabic"> | |
| <li> | |
| <p> | |
| It is preceded with a "git diff" header, that looks like | |
| this (when <em>-c</em> option is used): | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>diff --combined file</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>or like this (when <em>--cc</em> option is used):</p></div> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>diff --cc file</tt></pre> | |
| </div></div> | |
| </li> | |
| <li> | |
| <p> | |
| It is followed by one or more extended header lines | |
| (this example shows a merge with two parents): | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>index <hash>,<hash>..<hash> | |
| mode <mode>,<mode>..<mode> | |
| new file mode <mode> | |
| deleted file mode <mode>,<mode></tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of | |
| the <mode> is different from the rest. Extended headers with | |
| information about detected contents movement (renames and | |
| copying detection) are designed to work with diff of two | |
| <tree-ish> and are not used by combined diff format.</p></div> | |
| </li> | |
| <li> | |
| <p> | |
| It is followed by two-line from-file/to-file header | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>--- a/file | |
| +++ b/file</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff | |
| format, <tt>/dev/null</tt> is used to signal created or deleted | |
| files.</p></div> | |
| </li> | |
| <li> | |
| <p> | |
| Chunk header format is modified to prevent people from | |
| accidentally feeding it to <tt>patch -p1</tt>. Combined diff format | |
| was created for review of merge commit changes, and was not | |
| meant for apply. The change is similar to the change in the | |
| extended <em>index</em> header: | |
| </p> | |
| <div class="literalblock"> | |
| <div class="content"> | |
| <pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk | |
| header for combined diff format.</p></div> | |
| </li> | |
| </ol></div> | |
| <div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two | |
| 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 | |
| added to B), or <tt>" "</tt> (space — unchanged) prefix, this format | |
| compares two or more files file1, file2,… with one file X, and | |
| shows how X differs from each of fileN. One column for each of | |
| fileN is prepended to the output line to note how X’s line is | |
| different from it.</p></div> | |
| <div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in | |
| fileN but it does not appear in the result. A <tt>+</tt> character | |
| in the column N means that the line appears in the result, | |
| and fileN does not have that line (in other words, the line was | |
| added, from the point of view of that parent).</p></div> | |
| <div class="paragraph"><p>In the above example output, the function signature was changed | |
| from both files (hence two <tt>-</tt> removals from both file1 and | |
| file2, plus <tt>++</tt> to mean one line that was added does not appear | |
| in either file1 nor file2). Also eight other lines are the same | |
| from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div> | |
| <div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a | |
| merge commit with the merge result (i.e. file1..fileN are the | |
| parents). When shown by <tt>git diff-files -c</tt>, it compares the | |
| two unresolved merge parents with the working tree file | |
| (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka | |
| "their version").</p></div> | |
| </div> | |
| <h2 id="_examples">Examples</h2> | |
| <div class="sectionbody"> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| <tt>git log --no-merges</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the whole commit history, but skip any merges | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>git log v2.6.12.. include/scsi drivers/scsi</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show all commits since version <em>v2.6.12</em> that changed any file | |
| in the include/scsi or drivers/scsi subdirectories | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>git log --since="2 weeks ago" -- gitk</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the changes during the last two weeks to the file <em>gitk</em>. | |
| The "--" is necessary to avoid confusion with the <strong>branch</strong> named | |
| <em>gitk</em> | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>git log --name-status release..test</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the commits that are in the "test" branch but not yet | |
| in the "release" branch, along with the list of paths | |
| each commit modifies. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>git log --follow builtin-rev-list.c</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Shows the commits that changed builtin-rev-list.c, including | |
| those commits that occurred before the file was given its | |
| present name. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>git log --branches --not --remotes=origin</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Shows all commits that are in any of local branches but not in | |
| any of remote-tracking branches for <em>origin</em> (what you have that | |
| origin doesn’t). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>git log master --not --remotes=*/master</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Shows all commits that are in local master but not in any remote | |
| repository master branches. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <tt>git log -p -m --first-parent</tt> | |
| </dt> | |
| <dd> | |
| <p> | |
| Shows the history including change diffs, but only from the | |
| "main branch" perspective, skipping commits that come from merged | |
| branches, and showing full diffs of changes introduced by the merges. | |
| This makes sense only when following a strict policy of merging all | |
| topic branches when staying on a single integration branch. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| </div> | |
| <h2 id="_discussion">Discussion</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>At the core level, git is character encoding agnostic.</p></div> | |
| <div class="ulist"><ul> | |
| <li> | |
| <p> | |
| The pathnames recorded in the index and in the tree objects | |
| are treated as uninterpreted sequences of non-NUL bytes. | |
| What readdir(2) returns are what are recorded and compared | |
| with the data git keeps track of, which in turn are expected | |
| to be what lstat(2) and creat(2) accepts. There is no such | |
| thing as pathname encoding translation. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| The contents of the blob objects are uninterpreted sequences | |
| of bytes. There is no encoding translation at the core | |
| level. | |
| </p> | |
| </li> | |
| <li> | |
| <p> | |
| The commit log messages are uninterpreted sequences of non-NUL | |
| bytes. | |
| </p> | |
| </li> | |
| </ul></div> | |
| <div class="paragraph"><p>Although we encourage that the commit log messages are encoded | |
| in UTF-8, both the core and git Porcelain are designed not to | |
| force UTF-8 on projects. If all participants of a particular | |
| project find it more convenient to use legacy encodings, git | |
| does not forbid it. However, there are a few things to keep in | |
| mind.</p></div> | |
| <div class="olist arabic"><ol class="arabic"> | |
| <li> | |
| <p> | |
| <em>git commit</em> and <em>git commit-tree</em> issues | |
| a warning if the commit log message given to it does not look | |
| like a valid UTF-8 string, unless you explicitly say your | |
| project uses a legacy encoding. The way to say this is to | |
| have i18n.commitencoding in <tt>.git/config</tt> file, like this: | |
| </p> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt>[i18n] | |
| commitencoding = ISO-8859-1</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>Commit objects created with the above setting record the value | |
| of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to | |
| help other people who look at them later. Lack of this header | |
| implies that the commit log message is encoded in UTF-8.</p></div> | |
| </li> | |
| <li> | |
| <p> | |
| <em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the | |
| <tt>encoding</tt> header of a commit object, and try to re-code the | |
| log message into UTF-8 unless otherwise specified. You can | |
| specify the desired output encoding with | |
| <tt>i18n.logoutputencoding</tt> in <tt>.git/config</tt> file, like this: | |
| </p> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><tt>[i18n] | |
| logoutputencoding = ISO-8859-1</tt></pre> | |
| </div></div> | |
| <div class="paragraph"><p>If you do not have this configuration variable, the value of | |
| <tt>i18n.commitencoding</tt> is used instead.</p></div> | |
| </li> | |
| </ol></div> | |
| <div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log | |
| message when a commit is made to force UTF-8 at the commit | |
| object level, because re-coding to UTF-8 is not necessarily a | |
| reversible operation.</p></div> | |
| </div> | |
| <h2 id="_configuration">Configuration</h2> | |
| <div class="sectionbody"> | |
| <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> | |
| for settings related to diff generation.</p></div> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| format.pretty | |
| </dt> | |
| <dd> | |
| <p> | |
| Default for the <tt>--format</tt> option. (See "PRETTY FORMATS" above.) | |
| Defaults to "medium". | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| i18n.logOutputEncoding | |
| </dt> | |
| <dd> | |
| <p> | |
| Encoding to use when displaying logs. (See "Discussion", above.) | |
| Defaults to the value of <tt>i18n.commitEncoding</tt> if set, UTF-8 | |
| otherwise. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| log.date | |
| </dt> | |
| <dd> | |
| <p> | |
| Default format for human-readable dates. (Compare the | |
| <tt>--date</tt> option.) Defaults to "default", which means to write | |
| dates like <tt>Sat May 8 19:35:34 2010 -0500</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| log.showroot | |
| </dt> | |
| <dd> | |
| <p> | |
| If <tt>false</tt>, <em>git log</em> and related commands will not treat the | |
| initial commit as a big creation event. Any root commits in | |
| <tt>git log -p</tt> output would be shown without a diff attached. | |
| The default is <tt>true</tt>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| mailmap.file | |
| </dt> | |
| <dd> | |
| <p> | |
| See <a href="git-shortlog.html">git-shortlog(1)</a>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| notes.displayRef | |
| </dt> | |
| <dd> | |
| <p> | |
| Which refs, in addition to the default set by <tt>core.notesRef</tt> | |
| or <em>GIT_NOTES_REF</em>, to read notes from when showing commit | |
| messages with the <em>log</em> family of commands. See | |
| <a href="git-notes.html">git-notes(1)</a>. | |
| </p> | |
| <div class="paragraph"><p>May be an unabbreviated ref name or a glob and may be specified | |
| multiple times. A warning will be issued for refs that do not exist, | |
| but a glob that does not match any refs is silently ignored.</p></div> | |
| <div class="paragraph"><p>This setting can be disabled by the <tt>--no-notes</tt> option, | |
| overridden by the <em>GIT_NOTES_DISPLAY_REF</em> environment variable, | |
| and overridden by the <tt>--notes=<ref></tt> option.</p></div> | |
| </dd> | |
| </dl></div> | |
| </div> | |
| <h2 id="_git">GIT</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> | |
| </div> | |
| </div> | |
| <div id="footnotes"><hr /></div> | |
| <div id="footer"> | |
| <div id="footer-text"> | |
| Last updated 2012-05-02 15:00:44 PDT | |
| </div> | |
| </div> | |
| </body> | |
| </html> |