blob: d5f81182610cf842bd543ea85f83c991778436b9 [file] [log] [blame]
Junio C Hamano215a7ad2005-09-07 17:26:23 -07001git-branch(1)
2=============
Junio C Hamano7fc9d692005-08-23 01:49:47 -07003
4NAME
5----
Sean Estabrooks2eaf2732006-04-28 09:15:04 -04006git-branch - List, create, or delete branches.
Junio C Hamano7fc9d692005-08-23 01:49:47 -07007
8SYNOPSIS
9--------
Jon Loeligerdd181112006-03-17 18:24:37 -060010[verse]
Brian Gernhardtf3673982007-01-03 10:36:29 -050011'git-branch' [--color | --no-color] [-r | -a] [-v [--abbrev=<length>]]
Shawn Pearce3a4b3f22006-05-19 05:16:58 -040012'git-branch' [-l] [-f] <branchname> [<start-point>]
Lars Hjemlic976d412006-11-28 15:47:40 +010013'git-branch' (-m | -M) [<oldbranch>] <newbranch>
Quy Tonthat7dda22e2006-12-21 15:18:07 +110014'git-branch' (-d | -D) [-r] <branchname>...
Junio C Hamano7fc9d692005-08-23 01:49:47 -070015
16DESCRIPTION
17-----------
Andy Parkinsbfcc9212006-11-21 19:31:24 +000018With no arguments given a list of existing branches
Sean Estabrooks2eaf2732006-04-28 09:15:04 -040019will be shown, the current branch will be highlighted with an asterisk.
Andy Parkinsbfcc9212006-11-21 19:31:24 +000020Option `-r` causes the remote-tracking branches to be listed,
21and option `-a` shows both.
Junio C Hamano7fc9d692005-08-23 01:49:47 -070022
Sean Estabrooks2eaf2732006-04-28 09:15:04 -040023In its second form, a new branch named <branchname> will be created.
24It will start out with a head equal to the one given as <start-point>.
25If no <start-point> is given, the branch will be created with a head
26equal to that of the currently checked out branch.
27
Lars Hjemlic976d412006-11-28 15:47:40 +010028With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
29If <oldbranch> had a corresponding reflog, it is renamed to match
30<newbranch>, and a reflog entry is created to remember the branch
31renaming. If <newbranch> exists, -M must be used to force the rename
32to happen.
33
Sean Estabrooks2eaf2732006-04-28 09:15:04 -040034With a `-d` or `-D` option, `<branchname>` will be deleted. You may
Shawn Pearce3a4b3f22006-05-19 05:16:58 -040035specify more than one branch for deletion. If the branch currently
Quy Tonthat7dda22e2006-12-21 15:18:07 +110036has a ref log then the ref log will also be deleted. Use -r together with -d
37to delete remote-tracking branches.
Jon Loeligerdd181112006-03-17 18:24:37 -060038
39
Junio C Hamano7fc9d692005-08-23 01:49:47 -070040OPTIONS
41-------
Andreas Ericssond4072c92005-11-14 17:53:42 +010042-d::
43 Delete a branch. The branch must be fully merged.
44
45-D::
46 Delete a branch irrespective of its index status.
47
Shawn Pearce3a4b3f22006-05-19 05:16:58 -040048-l::
49 Create the branch's ref log. This activates recording of
50 all changes to made the branch ref, enabling use of date
51 based sha1 expressions such as "<branchname>@{yesterday}".
52
Fredrik Kuivinen075dd8e2006-01-29 15:02:51 +010053-f::
Sean Estabrooks2eaf2732006-04-28 09:15:04 -040054 Force the creation of a new branch even if it means deleting
55 a branch that already exists with the same name.
56
Lars Hjemlic976d412006-11-28 15:47:40 +010057-m::
58 Move/rename a branch and the corresponding reflog.
59
60-M::
61 Move/rename a branch even if the new branchname already exists.
62
Brian Gernhardtf3673982007-01-03 10:36:29 -050063--color::
64 Color branches to highlight current, local, and remote branches.
65
66--no-color::
67 Turn off branch colors, even when the configuration file gives the
68 default to color output.
69
Sean Estabrooks2eaf2732006-04-28 09:15:04 -040070-r::
Quy Tonthat7dda22e2006-12-21 15:18:07 +110071 List or delete (if used with -d) the remote-tracking branches.
Andy Parkinsbfcc9212006-11-21 19:31:24 +000072
73-a::
74 List both remote-tracking branches and local branches.
Fredrik Kuivinen075dd8e2006-01-29 15:02:51 +010075
Lars Hjemli75e6e212006-11-24 14:45:10 +010076-v::
René Scharfe23bfbb82007-01-17 16:32:41 +010077 Show sha1 and commit subject line for each head.
Lars Hjemli75e6e212006-11-24 14:45:10 +010078
79--abbrev=<length>::
80 Alter minimum display length for sha1 in output listing,
81 default value is 7.
82
A Large Angry SCM52a22d12005-08-26 18:18:48 -070083<branchname>::
Andreas Ericssond4072c92005-11-14 17:53:42 +010084 The name of the branch to create or delete.
Shawn Pearce2b1f4242006-05-20 21:54:46 -040085 The new branch name must pass all checks defined by
86 gitlink:git-check-ref-format[1]. Some of these checks
87 may restrict the characters allowed in a branch name.
Junio C Hamano7fc9d692005-08-23 01:49:47 -070088
Fredrik Kuivinen075dd8e2006-01-29 15:02:51 +010089<start-point>::
Sean Estabrooks2eaf2732006-04-28 09:15:04 -040090 The new branch will be created with a HEAD equal to this. It may
91 be given as a branch name, a commit-id, or a tag. If this option
92 is omitted, the current branch is assumed.
93
Lars Hjemlic976d412006-11-28 15:47:40 +010094<oldbranch>::
95 The name of an existing branch to rename.
96
97<newbranch>::
98 The new name for an existing branch. The same restrictions as for
99 <branchname> applies.
Junio C Hamano7fc9d692005-08-23 01:49:47 -0700100
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800101
102Examples
Sean Estabrooks2eaf2732006-04-28 09:15:04 -0400103--------
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800104
Jon Loeligerdd181112006-03-17 18:24:37 -0600105Start development off of a known tag::
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800106+
107------------
108$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
109$ cd my2.6
Sean Estabrooks2eaf2732006-04-28 09:15:04 -0400110$ git branch my2.6.14 v2.6.14 <1>
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800111$ git checkout my2.6.14
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800112------------
Sean Estabrooks2eaf2732006-04-28 09:15:04 -0400113+
114<1> This step and the next one could be combined into a single step with
115"checkout -b my2.6.14 v2.6.14".
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800116
117Delete unneeded branch::
118+
119------------
120$ git clone git://git.kernel.org/.../git.git my.git
121$ cd my.git
Quy Tonthat7dda22e2006-12-21 15:18:07 +1100122$ git branch -d -r todo html man <1>
123$ git branch -D test <2>
Sean Estabrooks2eaf2732006-04-28 09:15:04 -0400124------------
125+
Quy Tonthat7dda22e2006-12-21 15:18:07 +1100126<1> delete remote-tracking branches "todo", "html", "man"
127<2> delete "test" branch even if the "master" branch does not have all
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800128commits from todo branch.
Sean Estabrooks2eaf2732006-04-28 09:15:04 -0400129
130
131Notes
132-----
133
134If you are creating a branch that you want to immediately checkout, it's
135easier to use the git checkout command with its `-b` option to create
136a branch and check it out with a single command.
137
Junio C Hamano1e2ccd32005-12-12 23:24:06 -0800138
Junio C Hamano7fc9d692005-08-23 01:49:47 -0700139Author
140------
141Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
142
143Documentation
144--------------
145Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
146
147GIT
148---
Sergey Vlasova7154e92005-09-19 14:10:51 +0400149Part of the gitlink:git[7] suite
Junio C Hamano7fc9d692005-08-23 01:49:47 -0700150