blob: 89ec5364ecd447f6a7836d9c7f582dbd1d864807 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-show-branch(1)
2==================
3
4NAME
5----
Junio C Hamano01078922006-03-10 00:31:476git-show-branch - Show branches and their commits
Junio C Hamano1a4e8412005-12-27 08:17:237
8SYNOPSIS
9--------
Junio C Hamano38064d52006-01-15 10:13:4910[verse]
Junio C Hamanocca56612009-06-03 08:27:3311'git show-branch' [--all] [--remotes] [--topo-order | --date-order]
12[--current] [--color | --no-color]
Junio C Hamano2bb13102006-03-06 07:10:2113[--more=<n> | --list | --independent | --merge-base]
Junio C Hamanocca56612009-06-03 08:27:3314[--no-name | --sha1-name] [--topics]
15[<rev> | <glob>]...
Junio C Hamanofce7c7e2008-07-02 03:06:3816'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]
Junio C Hamano1a4e8412005-12-27 08:17:2317
18DESCRIPTION
19-----------
20
21Shows the commit ancestry graph starting from the commits named
22with <rev>s or <globs>s (or all refs under $GIT_DIR/refs/heads
23and/or $GIT_DIR/refs/tags) semi-visually.
24
25It cannot show more than 29 branches and commits at a time.
26
Junio C Hamano38064d52006-01-15 10:13:4927It uses `showbranch.default` multi-valued configuration items if
28no <rev> nor <glob> is given on the command line.
29
Junio C Hamano1a4e8412005-12-27 08:17:2330
31OPTIONS
32-------
33<rev>::
Junio C Hamanofce7c7e2008-07-02 03:06:3834Arbitrary extended SHA1 expression (see linkgit:git-rev-parse[1])
Junio C Hamano54bf1e22008-12-20 06:30:1135that typically names a branch head or a tag.
Junio C Hamano1a4e8412005-12-27 08:17:2336
37<glob>::
38A glob pattern that matches branch or tag names under
39$GIT_DIR/refs. For example, if you have many topic
40branches under $GIT_DIR/refs/heads/topic, giving
41`topic/*` would show all of them.
42
Junio C Hamanoeb415992008-06-08 22:49:4743-r::
44--remotes::
Junio C Hamano30e1db12006-12-23 10:29:5245Show the remote-tracking branches.
46
Junio C Hamanoeb415992008-06-08 22:49:4747-a::
48--all::
Junio C Hamano30e1db12006-12-23 10:29:5249Show both remote-tracking branches and local branches.
Junio C Hamano1a4e8412005-12-27 08:17:2350
Junio C Hamano38064d52006-01-15 10:13:4951--current::
52With this option, the command includes the current
53branch to the list of revs to be shown when it is not
54given on the command line.
55
Junio C Hamano1a4e8412005-12-27 08:17:2356--topo-order::
57 By default, the branches and their commits are shown in
58 reverse chronological order. This option makes them
59 appear in topological order (i.e., descendant commits
60 are shown before their parents).
61
Junio C Hamanocca56612009-06-03 08:27:3362--date-order::
63This option is similar to '--topo-order' in the sense that no
64parent comes before all of its children, but otherwise commits
65are ordered according to their commit date.
66
Junio C Hamano872c5682006-07-07 06:05:4067--sparse::
68By default, the output omits merges that are reachable
69from only one tip being shown. This option makes them
70visible.
71
Junio C Hamano1a4e8412005-12-27 08:17:2372--more=<n>::
73Usually the command stops output upon showing the commit
74that is the common ancestor of all the branches. This
75flag tells the command to go <n> more common commits
76beyond that. When <n> is negative, display only the
77<reference>s given, without showing the commit ancestry
78tree.
79
80--list::
Junio C Hamano38064d52006-01-15 10:13:4981Synonym to `--more=-1`
Junio C Hamano1a4e8412005-12-27 08:17:2382
83--merge-base::
84Instead of showing the commit list, just act like the
Junio C Hamanoba4b9282008-07-06 05:20:3185'git-merge-base -a' command, except that it can accept
Junio C Hamano1a4e8412005-12-27 08:17:2386more than two heads.
87
88--independent::
89Among the <reference>s given, display only the ones that
90cannot be reached from any other <reference>.
91
92--no-name::
93Do not show naming strings for each commit.
94
95--sha1-name::
96Instead of naming the commits using the path to reach
97them from heads (e.g. "master~2" to mean the grandparent
98of "master"), name them with the unique prefix of their
99object names.
100
Junio C Hamano52401ef2006-12-19 00:54:38101--topics::
102Shows only commits that are NOT on the first branch given.
103This helps track topic branches by hiding any commit that
104is already in the main line of development. When given
105"git show-branch --topics master topic1 topic2", this
106will show the revisions given by "git rev-list {caret}master
107topic1 topic2"
108
Junio C Hamanoa3bb6eb2009-02-05 01:26:33109-g::
Junio C Hamano16cf1582007-02-05 07:21:48110--reflog[=<n>[,<base>]] [<ref>]::
Junio C Hamanodb450ba2007-01-21 08:57:14111Shows <n> most recent ref-log entries for the given
112ref. If <base> is given, <n> entries going back from
Junio C Hamanofa0d4cf2007-01-25 02:23:58113that entry. <base> can be specified as count or date.
Junio C Hamanoa3bb6eb2009-02-05 01:26:33114When no explicit <ref> parameter is given, it defaults to the
Junio C Hamano16cf1582007-02-05 07:21:48115current branch (or `HEAD` if it is detached).
Junio C Hamanod793de52006-12-26 09:11:43116
Junio C Hamano52ba2952009-05-18 17:43:02117--color::
118Color the status sign (one of these: `*` `!` `+` `-`) of each commit
119corresponding to the branch it's in.
120
121--no-color::
122Turn off colored output, even when the configuration file gives the
123default to color output.
124
Junio C Hamano1a4e8412005-12-27 08:17:23125Note that --more, --list, --independent and --merge-base options
126are mutually exclusive.
127
128
129OUTPUT
130------
131Given N <references>, the first N lines are the one-line
132description from their commit message. The branch head that is
Junio C Hamano38064d52006-01-15 10:13:49133pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*`
134character while other heads are prefixed with a `!` character.
Junio C Hamano1a4e8412005-12-27 08:17:23135
136Following these N lines, one-line log for each commit is
137displayed, indented N places. If a commit is on the I-th
Junio C Hamano38064d52006-01-15 10:13:49138branch, the I-th indentation character shows a `+` sign;
139otherwise it shows a space. Merge commits are denoted by
140a `-` sign. Each commit shows a short name that
Junio C Hamano235a91e2006-01-07 01:13:58141can be used as an extended SHA1 to name that commit.
Junio C Hamano1a4e8412005-12-27 08:17:23142
143The following example shows three branches, "master", "fixes"
144and "mhf":
145
146------------------------------------------------
147$ git show-branch master fixes mhf
Junio C Hamano38064d52006-01-15 10:13:49148* [master] Add 'git show-branch'.
Junio C Hamano1a4e8412005-12-27 08:17:23149 ! [fixes] Introduce "reset type" flag to "git reset"
150 ! [mhf] Allow "+remote:local" refspec to cause --force when fetching.
151---
152 + [mhf] Allow "+remote:local" refspec to cause --force when fetching.
153 + [mhf~1] Use git-octopus when pulling more than one heads.
154 + [fixes] Introduce "reset type" flag to "git reset"
155 + [mhf~2] "git fetch --force".
156 + [mhf~3] Use .git/remote/origin, not .git/branches/origin.
157 + [mhf~4] Make "git pull" and "git fetch" default to origin
158 + [mhf~5] Infamous 'octopus merge'
159 + [mhf~6] Retire git-parse-remote.
160 + [mhf~7] Multi-head fetch.
161 + [mhf~8] Start adding the $GIT_DIR/remotes/ support.
Junio C Hamano38064d52006-01-15 10:13:49162*++ [master] Add 'git show-branch'.
Junio C Hamano1a4e8412005-12-27 08:17:23163------------------------------------------------
164
165These three branches all forked from a common commit, [master],
Junio C Hamanof4581102009-04-25 08:29:59166whose commit message is "Add \'git show-branch\'". The "fixes"
167branch adds one commit "Introduce "reset type" flag to "git reset"".
168The "mhf" branch adds many other commits. The current branch
169is "master".
Junio C Hamano38064d52006-01-15 10:13:49170
171
172EXAMPLE
173-------
174
175If you keep your primary branches immediately under
176`$GIT_DIR/refs/heads`, and topic branches in subdirectories of
177it, having the following in the configuration file may help:
178
179------------
180[showbranch]
181default = --topo-order
182default = heads/*
183
184------------
185
Junio C Hamano2b135272006-03-18 07:45:42186With this, `git show-branch` without extra parameters would show
Junio C Hamano38064d52006-01-15 10:13:49187only the primary branches. In addition, if you happen to be on
188your topic branch, it is shown as well.
189
Junio C Hamanodb450ba2007-01-21 08:57:14190------------
Junio C Hamanof62a11d2008-12-21 12:16:36191$ git show-branch --reflog="10,1 hour ago" --list master
Junio C Hamanodb450ba2007-01-21 08:57:14192------------
193
194shows 10 reflog entries going back from the tip as of 1 hour ago.
195Without `--list`, the output also shows how these tips are
196topologically related with each other.
Junio C Hamano1a4e8412005-12-27 08:17:23197
198
199Author
200------
Junio C Hamano0868a302008-07-22 09:20:44201Written by Junio C Hamano <gitster@pobox.com>
Junio C Hamano1a4e8412005-12-27 08:17:23202
203
204Documentation
205--------------
206Documentation by Junio C Hamano.
207
208
209GIT
210---
Junio C Hamanof7c042d2008-06-06 22:50:53211Part of the linkgit:git[1] suite