1 <!DOCTYPE html PUBLIC
"-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns=
"http://www.w3.org/1999/xhtml" xml:
lang=
"en">
5 <meta http-equiv=
"Content-Type" content=
"text/html; charset=UTF-8" />
6 <meta name=
"generator" content=
"AsciiDoc 8.5.2" />
7 <title>git-show-branch(
1)
</title>
8 <style type=
"text/css">
10 p
, li
, dt
, dd
, div
, pre
, h1
, h2
, h3
, h4
, h5
, h6
{
12 border: 1px solid red;
17 margin: 1em 5% 1em 5%;
22 text-decoration: underline
;
42 h1
, h2
, h3
, h4
, h5
, h6
{
44 font-family: sans-serif
;
51 border-bottom: 2px solid silver
;
69 border: 1px solid silver
;
88 font-family: sans-serif
;
94 span#revnumber
, span#revdate
, span#revremark
{
95 font-family: sans-serif
;
99 font-family: sans-serif
;
101 border-top: 2px solid silver
;
107 padding-bottom: 0.5em;
111 padding-bottom: 0.5em;
116 margin-bottom: 1.5em;
118 div
.tableblock
, div
.imageblock
, div
.exampleblock
, div
.verseblock
,
119 div
.quoteblock
, div
.literalblock
, div
.listingblock
, div
.sidebarblock
,
120 div
.admonitionblock
{
122 margin-bottom: 1.5em;
124 div
.admonitionblock
{
126 margin-bottom: 2.0em;
131 div
.content
{ /* Block element content. */
135 /* Block element titles. */
136 div
.title
, caption
.title
{
138 font-family: sans-serif
;
142 margin-bottom: 0.5em;
148 td div
.title:first-child
{
151 div
.content div
.title:first-child
{
154 div
.content
+ div
.title
{
158 div
.sidebarblock
> div
.content
{
160 border: 1px solid silver
;
164 div
.listingblock
> div
.content
{
165 border: 1px solid silver
;
170 div
.quoteblock
, div
.verseblock
{
174 border-left: 5px solid
#dddddd;
178 div
.quoteblock
> div
.attribution
{
183 div
.verseblock
> div
.content
{
186 div
.verseblock
> div
.attribution
{
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 div
.verseblock
+ div
.attribution
{
195 div
.admonitionblock
.icon
{
199 text-decoration: underline
;
201 padding-right: 0.5em;
203 div
.admonitionblock td
.content
{
205 border-left: 3px solid
#dddddd;
208 div
.exampleblock
> div
.content
{
209 border-left: 3px solid
#dddddd;
213 div
.imageblock div
.content
{ padding-left: 0; }
214 span
.image img
{ border-style: none
; }
215 a
.image:visited
{ color: white
; }
219 margin-bottom: 0.8em;
232 list-style-position: outside
;
235 list-style-type: decimal
;
238 list-style-type: lower-alpha
;
241 list-style-type: upper-alpha
;
244 list-style-type: lower-roman
;
247 list-style-type: upper-roman
;
250 div
.compact ul
, div
.compact ol
,
251 div
.compact p
, div
.compact p
,
252 div
.compact div
, div
.compact div
{
254 margin-bottom: 0.1em;
257 div
.tableblock
> table
{
258 border: 3px solid
#527bbd;
260 thead
, p
.table
.header
{
261 font-family: sans-serif
;
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 div
.tableblock
> table
[frame
="void"] {
277 div
.tableblock
> table
[frame
="hsides"] {
278 border-left-style: none
;
279 border-right-style: none
;
281 div
.tableblock
> table
[frame
="vsides"] {
282 border-top-style: none
;
283 border-bottom-style: none
;
289 margin-bottom: 0.8em;
292 padding-bottom: 15px;
294 dt
.hdlist1
.strong
, td
.hdlist1
.strong
{
300 padding-right: 0.8em;
306 div
.hdlist
.compact tr
{
315 .footnote, .footnoteref {
319 span
.footnote
, span
.footnoteref
{
320 vertical-align: super
;
324 margin: 20px 0 20px 0;
328 #footnotes div
.footnote
{
334 border-top: 1px solid silver
;
344 div#footer-badges
{ display: none
; }
348 margin-bottom: 2.5em;
353 font-family: sans-serif
;
357 margin-bottom: 0.1em;
360 div
.toclevel1
, div
.toclevel2
, div
.toclevel3
, div
.toclevel4
{
376 /* Overrides for manpage documents */
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver
;
381 border-bottom: 2px solid silver
;
391 div#toc
{ display: none
; }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
396 div
.sidebar-content
{
398 border: 1px solid silver
;
401 div
.sidebar-title
, div
.image-title
{
403 font-family: sans-serif
;
406 margin-bottom: 0.5em;
409 div
.listingblock div
.content
{
410 border: 1px solid silver
;
415 div
.quoteblock-attribution
{
420 div
.verseblock-content
{
423 div
.verseblock-attribution
{
428 div
.exampleblock-content
{
429 border-left: 3px solid
#dddddd;
433 /* IE6 sets dynamically generated links as visited. */
434 div#toc
a:visited
{ color: blue
; }
436 <script type=
"text/javascript">
438 window
.onload = function(){asciidoc
.footnotes();}
439 var asciidoc
= { // Namespace.
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
448 * Table Of Content generator
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
459 toc: function (toclevels
) {
461 function getText(el
) {
463 for (var i
= el
.firstChild
; i
!= null; i
= i
.nextSibling
) {
464 if (i
.nodeType
== 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
466 else if (i
.firstChild
!= null)
472 function TocEntry(el
, text
, toclevel
) {
475 this.toclevel
= toclevel
;
478 function tocEntries(el
, toclevels
) {
479 var result
= new Array
;
480 var re
= new RegExp('[hH]([2-'+(toclevels
+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
484 var iterate = function (el
) {
485 for (var i
= el
.firstChild
; i
!= null; i
= i
.nextSibling
) {
486 if (i
.nodeType
== 1 /* Node.ELEMENT_NODE */) {
487 var mo
= re
.exec(i
.tagName
);
488 if (mo
&& (i
.getAttribute("class") || i
.getAttribute("className")) != "float") {
489 result
[result
.length
] = new TocEntry(i
, getText(i
), mo
[1]-1);
499 var toc
= document
.getElementById("toc");
500 var entries
= tocEntries(document
.getElementById("content"), toclevels
);
501 for (var i
= 0; i
< entries
.length
; ++i
) {
502 var entry
= entries
[i
];
503 if (entry
.element
.id
== "")
504 entry
.element
.id
= "_toc_" + i
;
505 var a
= document
.createElement("a");
506 a
.href
= "#" + entry
.element
.id
;
507 a
.appendChild(document
.createTextNode(entry
.text
));
508 var div
= document
.createElement("div");
510 div
.className
= "toclevel" + entry
.toclevel
;
511 toc
.appendChild(div
);
513 if (entries
.length
== 0)
514 toc
.parentNode
.removeChild(toc
);
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
526 footnotes: function () {
527 var cont
= document
.getElementById("content");
528 var noteholder
= document
.getElementById("footnotes");
529 var spans
= cont
.getElementsByTagName("span");
532 for (i
=0; i
<spans
.length
; i
++) {
533 if (spans
[i
].className
== "footnote") {
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note
= spans
[i
].innerHTML
.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder
.innerHTML
+=
539 "<div class='footnote' id='_footnote_" + n
+ "'>" +
540 "<a href='#_footnoteref_" + n
+ "' title='Return to text'>" +
541 n
+ "</a>. " + note
+ "</div>";
543 "[<a id='_footnoteref_" + n
+ "' href='#_footnote_" + n
+
544 "' title='View footnote' class='footnote'>" + n
+ "</a>]";
545 var id
=spans
[i
].getAttribute("id");
546 if (id
!= null) refs
["#"+id
] = n
;
550 noteholder
.parentNode
.removeChild(noteholder
);
552 // Process footnoterefs.
553 for (i
=0; i
<spans
.length
; i
++) {
554 if (spans
[i
].className
== "footnoteref") {
555 var href
= spans
[i
].getElementsByTagName("a")[0].getAttribute("href");
556 href
= href
.match(/#.*/)[0]; // Because IE return full URL.
559 "[<a href='#_footnote_" + n
+
560 "' title='View footnote' class='footnote'>" + n
+ "</a>]";
573 git-show-branch(
1) Manual Page
576 <div class=
"sectionbody">
578 Show branches and their commits
583 <h2 id=
"_synopsis">SYNOPSIS
</h2>
584 <div class=
"sectionbody">
585 <div class=
"verseblock">
586 <div class=
"verseblock-content"><em>git show-branch
</em> [-a|--all] [-r|--remotes] [--topo-order | --date-order]
587 [--current] [--color[=
<when
>] | --no-color] [--sparse]
588 [--more=
<n
> | --list | --independent | --merge-base]
589 [--no-name | --sha1-name] [--topics]
590 [(
<rev
> |
<glob
>)
…]
591 <em>git show-branch
</em> (-g|--reflog)[=
<n
>[,
<base
>]] [--list] [
<ref
>]
</div>
592 <div class=
"verseblock-attribution">
595 <h2 id=
"_description">DESCRIPTION
</h2>
596 <div class=
"sectionbody">
597 <div class=
"paragraph"><p>Shows the commit ancestry graph starting from the commits named
598 with
<rev
>s or
<globs
>s (or all refs under refs/heads
599 and/or refs/tags) semi-visually.
</p></div>
600 <div class=
"paragraph"><p>It cannot show more than
29 branches and commits at a time.
</p></div>
601 <div class=
"paragraph"><p>It uses
<tt>showbranch.default
</tt> multi-valued configuration items if
602 no
<rev
> nor
<glob
> is given on the command line.
</p></div>
604 <h2 id=
"_options">OPTIONS
</h2>
605 <div class=
"sectionbody">
606 <div class=
"dlist"><dl>
612 Arbitrary extended SHA1 expression (see
<a href=
"gitrevisions.html">gitrevisions(
7)
</a>)
613 that typically names a branch head or a tag.
621 A glob pattern that matches branch or tag names under
622 refs/. For example, if you have many topic
623 branches under refs/heads/topic, giving
624 <tt>topic/*
</tt> would show all of them.
635 Show the remote-tracking branches.
646 Show both remote-tracking branches and local branches.
654 With this option, the command includes the current
655 branch to the list of revs to be shown when it is not
656 given on the command line.
664 By default, the branches and their commits are shown in
665 reverse chronological order. This option makes them
666 appear in topological order (i.e., descendant commits
667 are shown before their parents).
675 This option is similar to
<em>--topo-order
</em> in the sense that no
676 parent comes before all of its children, but otherwise commits
677 are ordered according to their commit date.
685 By default, the output omits merges that are reachable
686 from only one tip being shown. This option makes them
695 Usually the command stops output upon showing the commit
696 that is the common ancestor of all the branches. This
697 flag tells the command to go
<n
> more common commits
698 beyond that. When
<n
> is negative, display only the
699 <reference
>s given, without showing the commit ancestry
708 Synonym to
<tt>--more=-
1</tt>
716 Instead of showing the commit list, determine possible
717 merge bases for the specified commits. All merge bases
718 will be contained in all specified commits. This is
719 different from how
<a href=
"git-merge-base.html">git-merge-base(
1)
</a> handles
720 the case of three or more commits.
728 Among the
<reference
>s given, display only the ones that
729 cannot be reached from any other
<reference
>.
737 Do not show naming strings for each commit.
745 Instead of naming the commits using the path to reach
746 them from heads (e.g.
"master~2" to mean the grandparent
747 of
"master"), name them with the unique prefix of their
756 Shows only commits that are NOT on the first branch given.
757 This helps track topic branches by hiding any commit that
758 is already in the main line of development. When given
759 "git show-branch --topics master topic1 topic2", this
760 will show the revisions given by
"git rev-list ^master
768 --reflog[=
<n
>[,
<base
>]] [
<ref
>]
772 Shows
<n
> most recent ref-log entries for the given
773 ref. If
<base
> is given,
<n
> entries going back from
774 that entry.
<base
> can be specified as count or date.
775 When no explicit
<ref
> parameter is given, it defaults to the
776 current branch (or
<tt>HEAD
</tt> if it is detached).
780 --color[=
<when
>]
784 Color the status sign (one of these:
<tt>*
</tt> <tt>!
</tt> <tt>+
</tt> <tt>-
</tt>) of each commit
785 corresponding to the branch it
’s in.
786 The value must be always (the default), never, or auto.
794 Turn off colored output, even when the configuration file gives the
795 default to color output.
796 Same as
<tt>--color=never
</tt>.
800 <div class=
"paragraph"><p>Note that --more, --list, --independent and --merge-base options
801 are mutually exclusive.
</p></div>
803 <h2 id=
"_output">OUTPUT
</h2>
804 <div class=
"sectionbody">
805 <div class=
"paragraph"><p>Given N
<references
>, the first N lines are the one-line
806 description from their commit message. The branch head that is
807 pointed at by $GIT_DIR/HEAD is prefixed with an asterisk
<tt>*
</tt>
808 character while other heads are prefixed with a
<tt>!
</tt> character.
</p></div>
809 <div class=
"paragraph"><p>Following these N lines, one-line log for each commit is
810 displayed, indented N places. If a commit is on the I-th
811 branch, the I-th indentation character shows a
<tt>+
</tt> sign;
812 otherwise it shows a space. Merge commits are denoted by
813 a
<tt>-
</tt> sign. Each commit shows a short name that
814 can be used as an extended SHA1 to name that commit.
</p></div>
815 <div class=
"paragraph"><p>The following example shows three branches,
"master",
"fixes"
817 <div class=
"listingblock">
818 <div class=
"content">
819 <pre><tt>$ git show-branch master fixes mhf
820 * [master] Add 'git show-branch'.
821 ! [fixes] Introduce
"reset type" flag to
"git reset"
822 ! [mhf] Allow
"+remote:local" refspec to cause --force when fetching.
824 + [mhf] Allow
"+remote:local" refspec to cause --force when fetching.
825 + [mhf~
1] Use git-octopus when pulling more than one heads.
826 + [fixes] Introduce
"reset type" flag to
"git reset"
827 + [mhf~
2]
"git fetch --force".
828 + [mhf~
3] Use .git/remote/origin, not .git/branches/origin.
829 + [mhf~
4] Make
"git pull" and
"git fetch" default to origin
830 + [mhf~
5] Infamous 'octopus merge'
831 + [mhf~
6] Retire git-parse-remote.
832 + [mhf~
7] Multi-head fetch.
833 + [mhf~
8] Start adding the $GIT_DIR/remotes/ support.
834 *++ [master] Add 'git show-branch'.
</tt></pre>
836 <div class=
"paragraph"><p>These three branches all forked from a common commit, [master],
837 whose commit message is
"Add 'git show-branch'".
838 The
"fixes" branch adds one commit
"Introduce "reset type
" flag to
839 "git reset
"". The
"mhf" branch adds many other commits.
840 The current branch is
"master".
</p></div>
842 <h2 id=
"_example">EXAMPLE
</h2>
843 <div class=
"sectionbody">
844 <div class=
"paragraph"><p>If you keep your primary branches immediately under
845 <tt>refs/heads
</tt>, and topic branches in subdirectories of
846 it, having the following in the configuration file may help:
</p></div>
847 <div class=
"listingblock">
848 <div class=
"content">
849 <pre><tt>[showbranch]
850 default = --topo-order
851 default = heads/*
</tt></pre>
853 <div class=
"paragraph"><p>With this,
<tt>git show-branch
</tt> without extra parameters would show
854 only the primary branches. In addition, if you happen to be on
855 your topic branch, it is shown as well.
</p></div>
856 <div class=
"listingblock">
857 <div class=
"content">
858 <pre><tt>$ git show-branch
--reflog=
"10,1 hour ago" --list master
</tt></pre>
860 <div class=
"paragraph"><p>shows
10 reflog entries going back from the tip as of
1 hour ago.
861 Without
<tt>--list
</tt>, the output also shows how these tips are
862 topologically related with each other.
</p></div>
864 <h2 id=
"_git">GIT
</h2>
865 <div class=
"sectionbody">
866 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
869 <div id=
"footnotes"><hr /></div>
871 <div id=
"footer-text">
872 Last updated
2011-
09-
21 23:
01:
14 PDT