blob: 603f87f3b59358697da821ffe240be9caff43fa7 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-branch(1)
2=============
3
4NAME
5----
Junio C Hamano7c73c662007-01-19 00:37:506git-branch - List, create, or delete branches
Junio C Hamano1a4e8412005-12-27 08:17:237
8SYNOPSIS
9--------
Junio C Hamano2b135272006-03-18 07:45:4210[verse]
Junio C Hamanoa3fccdf2007-03-03 05:18:2611'git-branch' [--color | --no-color] [-r | -a]
12 [-v [--abbrev=<length> | --no-abbrev]]
Junio C Hamano103ad7f2007-03-14 11:19:2613'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
Junio C Hamanoe7935c42006-12-13 21:32:1714'git-branch' (-m | -M) [<oldbranch>] <newbranch>
Junio C Hamano63ef0ac2006-12-22 07:28:1815'git-branch' (-d | -D) [-r] <branchname>...
Junio C Hamano1a4e8412005-12-27 08:17:2316
17DESCRIPTION
18-----------
Junio C Hamanofe9acab2006-11-24 12:10:5519With no arguments given a list of existing branches
Junio C Hamanoc8d88c22006-04-29 07:02:0120will be shown, the current branch will be highlighted with an asterisk.
Junio C Hamanofe9acab2006-11-24 12:10:5521Option `-r` causes the remote-tracking branches to be listed,
22and option `-a` shows both.
Junio C Hamano1a4e8412005-12-27 08:17:2323
Junio C Hamanoc8d88c22006-04-29 07:02:0124In its second form, a new branch named <branchname> will be created.
25It will start out with a head equal to the one given as <start-point>.
26If no <start-point> is given, the branch will be created with a head
27equal to that of the currently checked out branch.
28
Junio C Hamano103ad7f2007-03-14 11:19:2629When a local branch is started off a remote branch, git can setup the
30branch so that gitlink:git-pull[1] will appropriately merge from that
31remote branch. If this behavior is desired, it is possible to make it
32the default using the global `branch.autosetupmerge` configuration
33flag. Otherwise, it can be chosen per-branch using the `--track`
34and `--no-track` options.
35
Junio C Hamanoe7935c42006-12-13 21:32:1736With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
37If <oldbranch> had a corresponding reflog, it is renamed to match
38<newbranch>, and a reflog entry is created to remember the branch
39renaming. If <newbranch> exists, -M must be used to force the rename
40to happen.
41
Junio C Hamanoc8d88c22006-04-29 07:02:0142With a `-d` or `-D` option, `<branchname>` will be deleted. You may
Junio C Hamano341071d2006-06-04 07:24:4843specify more than one branch for deletion. If the branch currently
Junio C Hamano63ef0ac2006-12-22 07:28:1844has a ref log then the ref log will also be deleted. Use -r together with -d
45to delete remote-tracking branches.
Junio C Hamano2b135272006-03-18 07:45:4246
47
Junio C Hamano1a4e8412005-12-27 08:17:2348OPTIONS
49-------
50-d::
51Delete a branch. The branch must be fully merged.
52
53-D::
54Delete a branch irrespective of its index status.
55
Junio C Hamano341071d2006-06-04 07:24:4856-l::
57Create the branch's ref log. This activates recording of
58all changes to made the branch ref, enabling use of date
59based sha1 expressions such as "<branchname>@{yesterday}".
60
Junio C Hamano560a1f62006-01-30 04:19:5761-f::
Junio C Hamanoc8d88c22006-04-29 07:02:0162Force the creation of a new branch even if it means deleting
63a branch that already exists with the same name.
64
Junio C Hamanoe7935c42006-12-13 21:32:1765-m::
66Move/rename a branch and the corresponding reflog.
67
68-M::
69Move/rename a branch even if the new branchname already exists.
70
Junio C Hamanoeb692952007-01-03 22:02:1271--color::
72Color branches to highlight current, local, and remote branches.
73
74--no-color::
75Turn off branch colors, even when the configuration file gives the
76default to color output.
77
Junio C Hamanoc8d88c22006-04-29 07:02:0178-r::
Junio C Hamano63ef0ac2006-12-22 07:28:1879List or delete (if used with -d) the remote-tracking branches.
Junio C Hamanofe9acab2006-11-24 12:10:5580
81-a::
82List both remote-tracking branches and local branches.
Junio C Hamano560a1f62006-01-30 04:19:5783
Junio C Hamano53edd072006-11-25 10:05:2184-v::
Junio C Hamanof9771f62007-01-17 17:42:3085Show sha1 and commit subject line for each head.
Junio C Hamano53edd072006-11-25 10:05:2186
87--abbrev=<length>::
88Alter minimum display length for sha1 in output listing,
89default value is 7.
90
Junio C Hamanoa3fccdf2007-03-03 05:18:2691--no-abbrev::
92Display the full sha1s in output listing rather than abbreviating them.
93
Junio C Hamano1a4e8412005-12-27 08:17:2394<branchname>::
95The name of the branch to create or delete.
Junio C Hamanob2f5edd2006-05-21 10:50:0996The new branch name must pass all checks defined by
97gitlink:git-check-ref-format[1]. Some of these checks
98may restrict the characters allowed in a branch name.
Junio C Hamano1a4e8412005-12-27 08:17:2399
Junio C Hamano560a1f62006-01-30 04:19:57100<start-point>::
Junio C Hamanoc8d88c22006-04-29 07:02:01101The new branch will be created with a HEAD equal to this. It may
102be given as a branch name, a commit-id, or a tag. If this option
103is omitted, the current branch is assumed.
104
Junio C Hamanoe7935c42006-12-13 21:32:17105<oldbranch>::
106The name of an existing branch to rename.
107
108<newbranch>::
109The new name for an existing branch. The same restrictions as for
110<branchname> applies.
Junio C Hamano1a4e8412005-12-27 08:17:23111
112
113Examples
Junio C Hamanoc8d88c22006-04-29 07:02:01114--------
Junio C Hamano1a4e8412005-12-27 08:17:23115
Junio C Hamano2b135272006-03-18 07:45:42116Start development off of a known tag::
Junio C Hamano1a4e8412005-12-27 08:17:23117+
118------------
119$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
120$ cd my2.6
Junio C Hamanoc8d88c22006-04-29 07:02:01121$ git branch my2.6.14 v2.6.14 <1>
Junio C Hamano1a4e8412005-12-27 08:17:23122$ git checkout my2.6.14
Junio C Hamano1a4e8412005-12-27 08:17:23123------------
Junio C Hamanoc8d88c22006-04-29 07:02:01124+
125<1> This step and the next one could be combined into a single step with
126"checkout -b my2.6.14 v2.6.14".
Junio C Hamano1a4e8412005-12-27 08:17:23127
128Delete unneeded branch::
129+
130------------
131$ git clone git://git.kernel.org/.../git.git my.git
132$ cd my.git
Junio C Hamano63ef0ac2006-12-22 07:28:18133$ git branch -d -r todo html man <1>
134$ git branch -D test <2>
Junio C Hamanoc8d88c22006-04-29 07:02:01135------------
136+
Junio C Hamano63ef0ac2006-12-22 07:28:18137<1> delete remote-tracking branches "todo", "html", "man"
138<2> delete "test" branch even if the "master" branch does not have all
Junio C Hamano1a4e8412005-12-27 08:17:23139commits from todo branch.
Junio C Hamanoc8d88c22006-04-29 07:02:01140
141
142Notes
143-----
144
145If you are creating a branch that you want to immediately checkout, it's
146easier to use the git checkout command with its `-b` option to create
147a branch and check it out with a single command.
148
Junio C Hamano1a4e8412005-12-27 08:17:23149
150Author
151------
152Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
153
154Documentation
155--------------
156Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
157
158GIT
159---
160Part of the gitlink:git[7] suite
161