blob: 5e78aed7de640d1ab5ecbfb6f2bd1cb97936732f [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 Hamanofce7c7e2008-07-02 03:06:3811'git branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
Junio C Hamanoa3fccdf2007-03-03 05:18:2612 [-v [--abbrev=<length> | --no-abbrev]]
Junio C Hamano0a16b952007-12-02 18:56:3413 [--contains <commit>]
Junio C Hamanofce7c7e2008-07-02 03:06:3814'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
15'git branch' (-m | -M) [<oldbranch>] <newbranch>
16'git branch' (-d | -D) [-r] <branchname>...
Junio C Hamano1a4e8412005-12-27 08:17:2317
18DESCRIPTION
19-----------
Junio C Hamanofe9acab2006-11-24 12:10:5520With no arguments given a list of existing branches
Junio C Hamanoc8d88c22006-04-29 07:02:0121will be shown, the current branch will be highlighted with an asterisk.
Junio C Hamanofe9acab2006-11-24 12:10:5522Option `-r` causes the remote-tracking branches to be listed,
23and option `-a` shows both.
Junio C Hamano0a16b952007-12-02 18:56:3424With `--contains <commit>`, shows only the branches that
25contains the named commit (in other words, the branches whose
26tip commits are descendant of the named commit).
Junio C Hamano47d68a52008-05-06 06:35:4027With `--merged`, only branches merged into HEAD will be listed, and
28with `--no-merged` only branches not merged into HEAD will be listed.
Junio C Hamano1a4e8412005-12-27 08:17:2329
Junio C Hamanoc8d88c22006-04-29 07:02:0130In its second form, a new branch named <branchname> will be created.
31It will start out with a head equal to the one given as <start-point>.
32If no <start-point> is given, the branch will be created with a head
33equal to that of the currently checked out branch.
34
Junio C Hamano1b50ce92007-10-03 12:05:5335Note that this will create the new branch, but it will not switch the
36working tree to it; use "git checkout <newbranch>" to switch to the
37new branch.
38
Junio C Hamano9c334152008-02-12 03:18:5239When a local branch is started off a remote branch, git sets up the
Junio C Hamanofce7c7e2008-07-02 03:06:3840branch so that `git-pull` will appropriately merge from
Junio C Hamano24bc09a2008-02-28 00:27:4441the remote branch. This behavior may be changed via the global
42`branch.autosetupmerge` configuration flag. That setting can be
43overridden by using the `--track` and `--no-track` options.
Junio C Hamano103ad7f2007-03-14 11:19:2644
Junio C Hamanoe7935c42006-12-13 21:32:1745With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
46If <oldbranch> had a corresponding reflog, it is renamed to match
47<newbranch>, and a reflog entry is created to remember the branch
48renaming. If <newbranch> exists, -M must be used to force the rename
49to happen.
50
Junio C Hamanoc8d88c22006-04-29 07:02:0151With a `-d` or `-D` option, `<branchname>` will be deleted. You may
Junio C Hamano341071d2006-06-04 07:24:4852specify more than one branch for deletion. If the branch currently
Junio C Hamano258e4412007-11-29 02:28:3253has a reflog then the reflog will also be deleted.
54
55Use -r together with -d to delete remote-tracking branches. Note, that it
56only makes sense to delete remote-tracking branches if they no longer exist
Junio C Hamanofce7c7e2008-07-02 03:06:3857in remote repository or if `git-fetch` was configured not to fetch
Junio C Hamano35738e82008-01-07 07:55:4658them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to
Junio C Hamano258e4412007-11-29 02:28:3259clean up all obsolete remote-tracking branches.
Junio C Hamano2b135272006-03-18 07:45:4260
61
Junio C Hamano1a4e8412005-12-27 08:17:2362OPTIONS
63-------
64-d::
Junio C Hamano258e4412007-11-29 02:28:3265Delete a branch. The branch must be fully merged in HEAD.
Junio C Hamano1a4e8412005-12-27 08:17:2366
67-D::
Junio C Hamano258e4412007-11-29 02:28:3268Delete a branch irrespective of its merged status.
Junio C Hamano1a4e8412005-12-27 08:17:2369
Junio C Hamano341071d2006-06-04 07:24:4870-l::
Junio C Hamano1d90cb02007-07-03 07:05:3171Create the branch's reflog. This activates recording of
72all changes made to the branch ref, enabling use of date
73based sha1 expressions such as "<branchname>@\{yesterday}".
Junio C Hamano341071d2006-06-04 07:24:4874
Junio C Hamano560a1f62006-01-30 04:19:5775-f::
Junio C Hamanoc8d88c22006-04-29 07:02:0176Force the creation of a new branch even if it means deleting
77a branch that already exists with the same name.
78
Junio C Hamanoe7935c42006-12-13 21:32:1779-m::
80Move/rename a branch and the corresponding reflog.
81
82-M::
83Move/rename a branch even if the new branchname already exists.
84
Junio C Hamanoeb692952007-01-03 22:02:1285--color::
86Color branches to highlight current, local, and remote branches.
87
88--no-color::
89Turn off branch colors, even when the configuration file gives the
90default to color output.
91
Junio C Hamanoc8d88c22006-04-29 07:02:0192-r::
Junio C Hamano63ef0ac2006-12-22 07:28:1893List or delete (if used with -d) the remote-tracking branches.
Junio C Hamanofe9acab2006-11-24 12:10:5594
95-a::
96List both remote-tracking branches and local branches.
Junio C Hamano560a1f62006-01-30 04:19:5797
Junio C Hamanoeb415992008-06-08 22:49:4798-v::
99--verbose::
Junio C Hamanof9771f62007-01-17 17:42:30100Show sha1 and commit subject line for each head.
Junio C Hamano53edd072006-11-25 10:05:21101
102--abbrev=<length>::
103Alter minimum display length for sha1 in output listing,
104default value is 7.
105
Junio C Hamanoa3fccdf2007-03-03 05:18:26106--no-abbrev::
107Display the full sha1s in output listing rather than abbreviating them.
108
Junio C Hamano1b50ce92007-10-03 12:05:53109--track::
Junio C Hamanofce7c7e2008-07-02 03:06:38110When creating a new branch, set up configuration so that `git-pull`
Junio C Hamano24bc09a2008-02-28 00:27:44111will automatically retrieve data from the start point, which must be
112a branch. Use this if you always pull from the same upstream branch
113into the new branch, and if you don't want to use "git pull
114<repository> <refspec>" explicitly. This behavior is the default
115when the start point is a remote branch. Set the
116branch.autosetupmerge configuration variable to `false` if you want
Junio C Hamanofce7c7e2008-07-02 03:06:38117`git-checkout` and `git-branch` to always behave as if '--no-track' were
Junio C Hamano24bc09a2008-02-28 00:27:44118given. Set it to `always` if you want this behavior when the
119start-point is either a local or remote branch.
Junio C Hamano1b50ce92007-10-03 12:05:53120
121--no-track::
Junio C Hamano24bc09a2008-02-28 00:27:44122Ignore the branch.autosetupmerge configuration variable.
Junio C Hamano1b50ce92007-10-03 12:05:53123
Junio C Hamano47d68a52008-05-06 06:35:40124--contains <commit>::
125Only list branches which contain the specified commit.
126
127--merged::
128Only list branches which are fully contained by HEAD.
129
130--no-merged::
131Do not list branches which are fully contained by HEAD.
132
Junio C Hamano1a4e8412005-12-27 08:17:23133<branchname>::
134The name of the branch to create or delete.
Junio C Hamanob2f5edd2006-05-21 10:50:09135The new branch name must pass all checks defined by
Junio C Hamano35738e82008-01-07 07:55:46136linkgit:git-check-ref-format[1]. Some of these checks
Junio C Hamanob2f5edd2006-05-21 10:50:09137may restrict the characters allowed in a branch name.
Junio C Hamano1a4e8412005-12-27 08:17:23138
Junio C Hamano560a1f62006-01-30 04:19:57139<start-point>::
Junio C Hamanoc8d88c22006-04-29 07:02:01140The new branch will be created with a HEAD equal to this. It may
141be given as a branch name, a commit-id, or a tag. If this option
142is omitted, the current branch is assumed.
143
Junio C Hamanoe7935c42006-12-13 21:32:17144<oldbranch>::
145The name of an existing branch to rename.
146
147<newbranch>::
148The new name for an existing branch. The same restrictions as for
149<branchname> applies.
Junio C Hamano1a4e8412005-12-27 08:17:23150
151
152Examples
Junio C Hamanoc8d88c22006-04-29 07:02:01153--------
Junio C Hamano1a4e8412005-12-27 08:17:23154
Junio C Hamano2b135272006-03-18 07:45:42155Start development off of a known tag::
Junio C Hamano1a4e8412005-12-27 08:17:23156+
157------------
158$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
159$ cd my2.6
Junio C Hamanoc8d88c22006-04-29 07:02:01160$ git branch my2.6.14 v2.6.14 <1>
Junio C Hamano1a4e8412005-12-27 08:17:23161$ git checkout my2.6.14
Junio C Hamano1a4e8412005-12-27 08:17:23162------------
Junio C Hamanoc8d88c22006-04-29 07:02:01163+
164<1> This step and the next one could be combined into a single step with
165"checkout -b my2.6.14 v2.6.14".
Junio C Hamano1a4e8412005-12-27 08:17:23166
167Delete unneeded branch::
168+
169------------
170$ git clone git://git.kernel.org/.../git.git my.git
171$ cd my.git
Junio C Hamano18b6ff32007-07-17 10:40:26172$ git branch -d -r origin/todo origin/html origin/man <1>
173$ git branch -D test <2>
Junio C Hamanoc8d88c22006-04-29 07:02:01174------------
175+
Junio C Hamano258e4412007-11-29 02:28:32176<1> Delete remote-tracking branches "todo", "html", "man". Next 'fetch' or
177'pull' will create them again unless you configure them not to. See
Junio C Hamano35738e82008-01-07 07:55:46178linkgit:git-fetch[1].
Junio C Hamano258e4412007-11-29 02:28:32179<2> Delete "test" branch even if the "master" branch (or whichever branch is
180currently checked out) does not have all commits from test branch.
Junio C Hamanoc8d88c22006-04-29 07:02:01181
182
183Notes
184-----
185
186If you are creating a branch that you want to immediately checkout, it's
187easier to use the git checkout command with its `-b` option to create
188a branch and check it out with a single command.
189
Junio C Hamano47d68a52008-05-06 06:35:40190The options `--contains`, `--merged` and `--no-merged` serves three related
191but different purposes:
192
193- `--contains <commit>` is used to find all branches which will need
194 special attention if <commit> were to be rebased or amended, since those
195 branches contain the specified <commit>.
196
197- `--merged` is used to find all branches which can be safely deleted,
198 since those branches are fully contained by HEAD.
199
200- `--no-merged` is used to find branches which are candidates for merging
201 into HEAD, since those branches are not fully contained by HEAD.
Junio C Hamano1a4e8412005-12-27 08:17:23202
203Author
204------
205Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
206
207Documentation
208--------------
209Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
210
211GIT
212---
Junio C Hamanof7c042d2008-06-06 22:50:53213Part of the linkgit:git[1] suite