| <!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="application/xhtml+xml; charset=UTF-8" /> | |
| <meta name="generator" content="AsciiDoc 8.6.8" /> | |
| <title>git-show-branch(1)</title> | |
| <style type="text/css"> | |
| /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ | |
| /* Default font. */ | |
| body { | |
| font-family: Georgia,serif; | |
| } | |
| /* Title font. */ | |
| h1, h2, h3, h4, h5, h6, | |
| div.title, caption.title, | |
| thead, p.table.header, | |
| #toctitle, | |
| #author, #revnumber, #revdate, #revremark, | |
| #footer { | |
| font-family: Arial,Helvetica,sans-serif; | |
| } | |
| 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; | |
| } | |
| h1, h2, h3, h4, h5, h6 { | |
| color: #527bbd; | |
| 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; | |
| } | |
| h5 { | |
| font-size: 1.0em; | |
| } | |
| div.sectionbody { | |
| margin-left: 0; | |
| } | |
| hr { | |
| border: 1px solid silver; | |
| } | |
| p { | |
| margin-top: 0.5em; | |
| margin-bottom: 0.5em; | |
| } | |
| ul, ol, li > p { | |
| margin-top: 0; | |
| } | |
| ul > li { color: #aaa; } | |
| ul > li > * { color: black; } | |
| .monospaced, code, pre { | |
| font-family: "Courier New", Courier, monospace; | |
| font-size: inherit; | |
| color: navy; | |
| padding: 0; | |
| margin: 0; | |
| } | |
| #author { | |
| color: #527bbd; | |
| font-weight: bold; | |
| font-size: 1.1em; | |
| } | |
| #email { | |
| } | |
| #revnumber, #revdate, #revremark { | |
| } | |
| #footer { | |
| font-size: small; | |
| border-top: 2px solid silver; | |
| padding-top: 0.5em; | |
| margin-top: 4.0em; | |
| } | |
| #footer-text { | |
| float: left; | |
| padding-bottom: 0.5em; | |
| } | |
| #footer-badges { | |
| float: right; | |
| padding-bottom: 0.5em; | |
| } | |
| #preamble { | |
| margin-top: 1.5em; | |
| margin-bottom: 1.5em; | |
| } | |
| 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-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 #dddddd; | |
| border-left: 4px solid #f0f0f0; | |
| padding: 0.5em; | |
| } | |
| div.listingblock > div.content { | |
| border: 1px solid #dddddd; | |
| border-left: 5px solid #f0f0f0; | |
| background: #f8f8f8; | |
| padding: 0.5em; | |
| } | |
| div.quoteblock, div.verseblock { | |
| padding-left: 1.0em; | |
| margin-left: 1.0em; | |
| margin-right: 10%; | |
| border-left: 5px solid #f0f0f0; | |
| color: #888; | |
| } | |
| div.quoteblock > div.attribution { | |
| padding-top: 0.5em; | |
| text-align: right; | |
| } | |
| div.verseblock > pre.content { | |
| font-family: inherit; | |
| font-size: inherit; | |
| } | |
| 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; | |
| } | |
| tfoot { | |
| font-weight: bold; | |
| } | |
| td > div.verse { | |
| white-space: pre; | |
| } | |
| 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; | |
| } | |
| div.colist td { | |
| padding-right: 0.5em; | |
| padding-bottom: 0.3em; | |
| vertical-align: top; | |
| } | |
| div.colist td img { | |
| margin-top: 0.3em; | |
| } | |
| @media print { | |
| #footer-badges { display: none; } | |
| } | |
| #toc { | |
| margin-bottom: 2.5em; | |
| } | |
| #toctitle { | |
| color: #527bbd; | |
| font-size: 1.1em; | |
| font-weight: bold; | |
| margin-top: 1.0em; | |
| margin-bottom: 0.1em; | |
| } | |
| div.toclevel0, 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; | |
| } | |
| span.aqua { color: aqua; } | |
| span.black { color: black; } | |
| span.blue { color: blue; } | |
| span.fuchsia { color: fuchsia; } | |
| span.gray { color: gray; } | |
| span.green { color: green; } | |
| span.lime { color: lime; } | |
| span.maroon { color: maroon; } | |
| span.navy { color: navy; } | |
| span.olive { color: olive; } | |
| span.purple { color: purple; } | |
| span.red { color: red; } | |
| span.silver { color: silver; } | |
| span.teal { color: teal; } | |
| span.white { color: white; } | |
| span.yellow { color: yellow; } | |
| span.aqua-background { background: aqua; } | |
| span.black-background { background: black; } | |
| span.blue-background { background: blue; } | |
| span.fuchsia-background { background: fuchsia; } | |
| span.gray-background { background: gray; } | |
| span.green-background { background: green; } | |
| span.lime-background { background: lime; } | |
| span.maroon-background { background: maroon; } | |
| span.navy-background { background: navy; } | |
| span.olive-background { background: olive; } | |
| span.purple-background { background: purple; } | |
| span.red-background { background: red; } | |
| span.silver-background { background: silver; } | |
| span.teal-background { background: teal; } | |
| span.white-background { background: white; } | |
| span.yellow-background { background: yellow; } | |
| span.big { font-size: 2em; } | |
| span.small { font-size: 0.6em; } | |
| span.underline { text-decoration: underline; } | |
| span.overline { text-decoration: overline; } | |
| span.line-through { text-decoration: line-through; } | |
| div.unbreakable { page-break-inside: avoid; } | |
| /* | |
| * xhtml11 specific | |
| * | |
| * */ | |
| div.tableblock { | |
| margin-top: 1.0em; | |
| margin-bottom: 1.5em; | |
| } | |
| div.tableblock > table { | |
| border: 3px solid #527bbd; | |
| } | |
| thead, p.table.header { | |
| font-weight: bold; | |
| color: #527bbd; | |
| } | |
| 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; | |
| } | |
| /* | |
| * html5 specific | |
| * | |
| * */ | |
| table.tableblock { | |
| margin-top: 1.0em; | |
| margin-bottom: 1.5em; | |
| } | |
| thead, p.tableblock.header { | |
| font-weight: bold; | |
| color: #527bbd; | |
| } | |
| p.tableblock { | |
| margin-top: 0; | |
| } | |
| table.tableblock { | |
| border-width: 3px; | |
| border-spacing: 0px; | |
| border-style: solid; | |
| border-color: #527bbd; | |
| border-collapse: collapse; | |
| } | |
| th.tableblock, td.tableblock { | |
| border-width: 1px; | |
| padding: 4px; | |
| border-style: solid; | |
| border-color: #527bbd; | |
| } | |
| table.tableblock.frame-topbot { | |
| border-left-style: hidden; | |
| border-right-style: hidden; | |
| } | |
| table.tableblock.frame-sides { | |
| border-top-style: hidden; | |
| border-bottom-style: hidden; | |
| } | |
| table.tableblock.frame-none { | |
| border-style: hidden; | |
| } | |
| th.tableblock.halign-left, td.tableblock.halign-left { | |
| text-align: left; | |
| } | |
| th.tableblock.halign-center, td.tableblock.halign-center { | |
| text-align: center; | |
| } | |
| th.tableblock.halign-right, td.tableblock.halign-right { | |
| text-align: right; | |
| } | |
| th.tableblock.valign-top, td.tableblock.valign-top { | |
| vertical-align: top; | |
| } | |
| th.tableblock.valign-middle, td.tableblock.valign-middle { | |
| vertical-align: middle; | |
| } | |
| th.tableblock.valign-bottom, td.tableblock.valign-bottom { | |
| vertical-align: bottom; | |
| } | |
| /* | |
| * manpage specific | |
| * | |
| * */ | |
| body.manpage h1 { | |
| padding-top: 0.5em; | |
| padding-bottom: 0.5em; | |
| border-top: 2px solid silver; | |
| border-bottom: 2px solid silver; | |
| } | |
| body.manpage h2 { | |
| border-style: none; | |
| } | |
| body.manpage div.sectionbody { | |
| margin-left: 3em; | |
| } | |
| @media print { | |
| body.manpage div#toc { display: none; } | |
| } | |
| </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"); | |
| if (!toc) { | |
| return; | |
| } | |
| // Delete existing TOC entries in case we're reloading the TOC. | |
| var tocEntriesToRemove = []; | |
| var i; | |
| for (i = 0; i < toc.childNodes.length; i++) { | |
| var entry = toc.childNodes[i]; | |
| if (entry.nodeName.toLowerCase() == 'div' | |
| && entry.getAttribute("class") | |
| && entry.getAttribute("class").match(/^toclevel/)) | |
| tocEntriesToRemove.push(entry); | |
| } | |
| for (i = 0; i < tocEntriesToRemove.length; i++) { | |
| toc.removeChild(tocEntriesToRemove[i]); | |
| } | |
| // Rebuild TOC entries. | |
| 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 () { | |
| // Delete existing footnote entries in case we're reloading the footnodes. | |
| var i; | |
| var noteholder = document.getElementById("footnotes"); | |
| if (!noteholder) { | |
| return; | |
| } | |
| var entriesToRemove = []; | |
| for (i = 0; i < noteholder.childNodes.length; i++) { | |
| var entry = noteholder.childNodes[i]; | |
| if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") | |
| entriesToRemove.push(entry); | |
| } | |
| for (i = 0; i < entriesToRemove.length; i++) { | |
| noteholder.removeChild(entriesToRemove[i]); | |
| } | |
| // Rebuild footnote entries. | |
| var cont = document.getElementById("content"); | |
| var spans = cont.getElementsByTagName("span"); | |
| var refs = {}; | |
| var n = 0; | |
| for (i=0; i<spans.length; i++) { | |
| if (spans[i].className == "footnote") { | |
| n++; | |
| var note = spans[i].getAttribute("data-note"); | |
| if (!note) { | |
| // 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]; | |
| spans[i].innerHTML = | |
| "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n + | |
| "' title='View footnote' class='footnote'>" + n + "</a>]"; | |
| spans[i].setAttribute("data-note", note); | |
| } | |
| noteholder.innerHTML += | |
| "<div class='footnote' id='_footnote_" + n + "'>" + | |
| "<a href='#_footnoteref_" + n + "' title='Return to text'>" + | |
| n + "</a>. " + note + "</div>"; | |
| 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>]"; | |
| } | |
| } | |
| } | |
| }, | |
| install: function(toclevels) { | |
| var timerId; | |
| function reinstall() { | |
| asciidoc.footnotes(); | |
| if (toclevels) { | |
| asciidoc.toc(toclevels); | |
| } | |
| } | |
| function reinstallAndRemoveTimer() { | |
| clearInterval(timerId); | |
| reinstall(); | |
| } | |
| timerId = setInterval(reinstall, 500); | |
| if (document.addEventListener) | |
| document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false); | |
| else | |
| window.onload = reinstallAndRemoveTimer; | |
| } | |
| } | |
| asciidoc.install(); | |
| /*]]>*/ | |
| </script> | |
| </head> | |
| <body class="manpage"> | |
| <div id="header"> | |
| <h1> | |
| git-show-branch(1) Manual Page | |
| </h1> | |
| <h2>NAME</h2> | |
| <div class="sectionbody"> | |
| <p>git-show-branch - | |
| Show branches and their commits | |
| </p> | |
| </div> | |
| </div> | |
| <div id="content"> | |
| <div class="sect1"> | |
| <h2 id="_synopsis">SYNOPSIS</h2> | |
| <div class="sectionbody"> | |
| <div class="verseblock"> | |
| <pre class="content"><em>git show-branch</em> [-a|--all] [-r|--remotes] [--topo-order | --date-order] | |
| [--current] [--color[=<when>] | --no-color] [--sparse] | |
| [--more=<n> | --list | --independent | --merge-base] | |
| [--no-name | --sha1-name] [--topics] | |
| [(<rev> | <glob>)…] | |
| <em>git show-branch</em> (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]</pre> | |
| <div class="attribution"> | |
| </div></div> | |
| </div> | |
| </div> | |
| <div class="sect1"> | |
| <h2 id="_description">DESCRIPTION</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>Shows the commit ancestry graph starting from the commits named | |
| with <rev>s or <globs>s (or all refs under refs/heads | |
| and/or refs/tags) semi-visually.</p></div> | |
| <div class="paragraph"><p>It cannot show more than 29 branches and commits at a time.</p></div> | |
| <div class="paragraph"><p>It uses <code>showbranch.default</code> multi-valued configuration items if | |
| no <rev> nor <glob> is given on the command line.</p></div> | |
| </div> | |
| </div> | |
| <div class="sect1"> | |
| <h2 id="_options">OPTIONS</h2> | |
| <div class="sectionbody"> | |
| <div class="dlist"><dl> | |
| <dt class="hdlist1"> | |
| <rev> | |
| </dt> | |
| <dd> | |
| <p> | |
| Arbitrary extended SHA-1 expression (see <a href="gitrevisions.html">gitrevisions(7)</a>) | |
| that typically names a branch head or a tag. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| <glob> | |
| </dt> | |
| <dd> | |
| <p> | |
| A glob pattern that matches branch or tag names under | |
| refs/. For example, if you have many topic | |
| branches under refs/heads/topic, giving | |
| <code>topic/*</code> would show all of them. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -r | |
| </dt> | |
| <dt class="hdlist1"> | |
| --remotes | |
| </dt> | |
| <dd> | |
| <p> | |
| Show the remote-tracking branches. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -a | |
| </dt> | |
| <dt class="hdlist1"> | |
| --all | |
| </dt> | |
| <dd> | |
| <p> | |
| Show both remote-tracking branches and local branches. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --current | |
| </dt> | |
| <dd> | |
| <p> | |
| With this option, the command includes the current | |
| branch to the list of revs to be shown when it is not | |
| given on the command line. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --topo-order | |
| </dt> | |
| <dd> | |
| <p> | |
| By default, the branches and their commits are shown in | |
| reverse chronological order. 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 commits | |
| are ordered according to their commit date. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --sparse | |
| </dt> | |
| <dd> | |
| <p> | |
| By default, the output omits merges that are reachable | |
| from only one tip being shown. This option makes them | |
| visible. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --more=<n> | |
| </dt> | |
| <dd> | |
| <p> | |
| Usually the command stops output upon showing the commit | |
| that is the common ancestor of all the branches. This | |
| flag tells the command to go <n> more common commits | |
| beyond that. When <n> is negative, display only the | |
| <reference>s given, without showing the commit ancestry | |
| tree. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --list | |
| </dt> | |
| <dd> | |
| <p> | |
| Synonym to <code>--more=-1</code> | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --merge-base | |
| </dt> | |
| <dd> | |
| <p> | |
| Instead of showing the commit list, determine possible | |
| merge bases for the specified commits. All merge bases | |
| will be contained in all specified commits. This is | |
| different from how <a href="git-merge-base.html">git-merge-base(1)</a> handles | |
| the case of three or more commits. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --independent | |
| </dt> | |
| <dd> | |
| <p> | |
| Among the <reference>s given, display only the ones that | |
| cannot be reached from any other <reference>. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-name | |
| </dt> | |
| <dd> | |
| <p> | |
| Do not show naming strings for each commit. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --sha1-name | |
| </dt> | |
| <dd> | |
| <p> | |
| Instead of naming the commits using the path to reach | |
| them from heads (e.g. "master~2" to mean the grandparent | |
| of "master"), name them with the unique prefix of their | |
| object names. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --topics | |
| </dt> | |
| <dd> | |
| <p> | |
| Shows only commits that are NOT on the first branch given. | |
| This helps track topic branches by hiding any commit that | |
| is already in the main line of development. When given | |
| "git show-branch --topics master topic1 topic2", this | |
| will show the revisions given by "git rev-list ^master | |
| topic1 topic2" | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| -g | |
| </dt> | |
| <dt class="hdlist1"> | |
| --reflog[=<n>[,<base>]] [<ref>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Shows <n> most recent ref-log entries for the given | |
| ref. If <base> is given, <n> entries going back from | |
| that entry. <base> can be specified as count or date. | |
| When no explicit <ref> parameter is given, it defaults to the | |
| current branch (or <code>HEAD</code> if it is detached). | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --color[=<when>] | |
| </dt> | |
| <dd> | |
| <p> | |
| Color the status sign (one of these: <code>*</code> <code>!</code> <code>+</code> <code>-</code>) of each commit | |
| corresponding to the branch it’s in. | |
| The value must be always (the default), never, or auto. | |
| </p> | |
| </dd> | |
| <dt class="hdlist1"> | |
| --no-color | |
| </dt> | |
| <dd> | |
| <p> | |
| Turn off colored output, even when the configuration file gives the | |
| default to color output. | |
| Same as <code>--color=never</code>. | |
| </p> | |
| </dd> | |
| </dl></div> | |
| <div class="paragraph"><p>Note that --more, --list, --independent and --merge-base options | |
| are mutually exclusive.</p></div> | |
| </div> | |
| </div> | |
| <div class="sect1"> | |
| <h2 id="_output">OUTPUT</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>Given N <references>, the first N lines are the one-line | |
| description from their commit message. The branch head that is | |
| pointed at by $GIT_DIR/HEAD is prefixed with an asterisk <code>*</code> | |
| character while other heads are prefixed with a <code>!</code> character.</p></div> | |
| <div class="paragraph"><p>Following these N lines, one-line log for each commit is | |
| displayed, indented N places. If a commit is on the I-th | |
| branch, the I-th indentation character shows a <code>+</code> sign; | |
| otherwise it shows a space. Merge commits are denoted by | |
| a <code>-</code> sign. Each commit shows a short name that | |
| can be used as an extended SHA-1 to name that commit.</p></div> | |
| <div class="paragraph"><p>The following example shows three branches, "master", "fixes" | |
| and "mhf":</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><code>$ git show-branch master fixes mhf | |
| * [master] Add 'git show-branch'. | |
| ! [fixes] Introduce "reset type" flag to "git reset" | |
| ! [mhf] Allow "+remote:local" refspec to cause --force when fetching. | |
| --- | |
| + [mhf] Allow "+remote:local" refspec to cause --force when fetching. | |
| + [mhf~1] Use git-octopus when pulling more than one heads. | |
| + [fixes] Introduce "reset type" flag to "git reset" | |
| + [mhf~2] "git fetch --force". | |
| + [mhf~3] Use .git/remote/origin, not .git/branches/origin. | |
| + [mhf~4] Make "git pull" and "git fetch" default to origin | |
| + [mhf~5] Infamous 'octopus merge' | |
| + [mhf~6] Retire git-parse-remote. | |
| + [mhf~7] Multi-head fetch. | |
| + [mhf~8] Start adding the $GIT_DIR/remotes/ support. | |
| *++ [master] Add 'git show-branch'.</code></pre> | |
| </div></div> | |
| <div class="paragraph"><p>These three branches all forked from a common commit, [master], | |
| whose commit message is "Add 'git show-branch'". | |
| The "fixes" branch adds one commit "Introduce "reset type" flag to | |
| "git reset"". The "mhf" branch adds many other commits. | |
| The current branch is "master".</p></div> | |
| </div> | |
| </div> | |
| <div class="sect1"> | |
| <h2 id="_example">EXAMPLE</h2> | |
| <div class="sectionbody"> | |
| <div class="paragraph"><p>If you keep your primary branches immediately under | |
| <code>refs/heads</code>, and topic branches in subdirectories of | |
| it, having the following in the configuration file may help:</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><code>[showbranch] | |
| default = --topo-order | |
| default = heads/*</code></pre> | |
| </div></div> | |
| <div class="paragraph"><p>With this, <code>git show-branch</code> without extra parameters would show | |
| only the primary branches. In addition, if you happen to be on | |
| your topic branch, it is shown as well.</p></div> | |
| <div class="listingblock"> | |
| <div class="content"> | |
| <pre><code>$ git show-branch --reflog="10,1 hour ago" --list master</code></pre> | |
| </div></div> | |
| <div class="paragraph"><p>shows 10 reflog entries going back from the tip as of 1 hour ago. | |
| Without <code>--list</code>, the output also shows how these tips are | |
| topologically related with each other.</p></div> | |
| </div> | |
| </div> | |
| <div class="sect1"> | |
| <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> | |
| <div id="footnotes"><hr /></div> | |
| <div id="footer"> | |
| <div id="footer-text"> | |
| Last updated 2013-08-20 08:40:27 PDT | |
| </div> | |
| </div> | |
| </body> | |
| </html> |