Documentation / git-branch.txton commit Merge branch 'rj/mingw-isguid' (e7779c2)
   1git-branch(1)
   2=============
   3
   4NAME
   5----
   6git-branch - List, create, or delete branches
   7
   8SYNOPSIS
   9--------
  10[verse]
  11'git branch' [--color[=<when>] | --no-color] [-r | -a]
  12        [--list] [-v [--abbrev=<length> | --no-abbrev]]
  13        [(--merged | --no-merged | --contains) [<commit>]] [<pattern>...]
  14'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
  15'git branch' (-m | -M) [<oldbranch>] <newbranch>
  16'git branch' (-d | -D) [-r] <branchname>...
  17'git branch' --edit-description [<branchname>]
  18
  19DESCRIPTION
  20-----------
  21
  22With no arguments, existing branches are listed and the current branch will
  23be highlighted with an asterisk.  Option `-r` causes the remote-tracking
  24branches to be listed, and option `-a` shows both. This list mode is also
  25activated by the `--list` option (see below).
  26<pattern> restricts the output to matching branches, the pattern is a shell
  27wildcard (i.e., matched using fnmatch(3)).
  28Multiple patterns may be given; if any of them matches, the branch is shown.
  29
  30With `--contains`, shows only the branches that contain the named commit
  31(in other words, the branches whose tip commits are descendants of the
  32named commit).  With `--merged`, only branches merged into the named
  33commit (i.e. the branches whose tip commits are reachable from the named
  34commit) will be listed.  With `--no-merged` only branches not merged into
  35the named commit will be listed.  If the <commit> argument is missing it
  36defaults to 'HEAD' (i.e. the tip of the current branch).
  37
  38The command's second form creates a new branch head named <branchname>
  39which points to the current 'HEAD', or <start-point> if given.
  40
  41Note that this will create the new branch, but it will not switch the
  42working tree to it; use "git checkout <newbranch>" to switch to the
  43new branch.
  44
  45When a local branch is started off a remote-tracking branch, git sets up the
  46branch so that 'git pull' will appropriately merge from
  47the remote-tracking branch. This behavior may be changed via the global
  48`branch.autosetupmerge` configuration flag. That setting can be
  49overridden by using the `--track` and `--no-track` options, and
  50changed later using `git branch --set-upstream`.
  51
  52With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>.
  53If <oldbranch> had a corresponding reflog, it is renamed to match
  54<newbranch>, and a reflog entry is created to remember the branch
  55renaming. If <newbranch> exists, -M must be used to force the rename
  56to happen.
  57
  58With a `-d` or `-D` option, `<branchname>` will be deleted.  You may
  59specify more than one branch for deletion.  If the branch currently
  60has a reflog then the reflog will also be deleted.
  61
  62Use `-r` together with `-d` to delete remote-tracking branches. Note, that it
  63only makes sense to delete remote-tracking branches if they no longer exist
  64in the remote repository or if 'git fetch' was configured not to fetch
  65them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a
  66way to clean up all obsolete remote-tracking branches.
  67
  68
  69OPTIONS
  70-------
  71-d::
  72--delete::
  73        Delete a branch. The branch must be fully merged in its
  74        upstream branch, or in `HEAD` if no upstream was set with
  75        `--track` or `--set-upstream`.
  76
  77-D::
  78        Delete a branch irrespective of its merged status.
  79
  80-l::
  81--create-reflog::
  82        Create the branch's reflog.  This activates recording of
  83        all changes made to the branch ref, enabling use of date
  84        based sha1 expressions such as "<branchname>@\{yesterday}".
  85        Note that in non-bare repositories, reflogs are usually
  86        enabled by default by the `core.logallrefupdates` config option.
  87
  88-f::
  89--force::
  90        Reset <branchname> to <startpoint> if <branchname> exists
  91        already. Without `-f` 'git branch' refuses to change an existing branch.
  92
  93-m::
  94--move::
  95        Move/rename a branch and the corresponding reflog.
  96
  97-M::
  98        Move/rename a branch even if the new branch name already exists.
  99
 100--color[=<when>]::
 101        Color branches to highlight current, local, and
 102        remote-tracking branches.
 103        The value must be always (the default), never, or auto.
 104
 105--no-color::
 106        Turn off branch colors, even when the configuration file gives the
 107        default to color output.
 108        Same as `--color=never`.
 109
 110-r::
 111--remotes::
 112        List or delete (if used with -d) the remote-tracking branches.
 113
 114-a::
 115--all::
 116        List both remote-tracking branches and local branches.
 117
 118--list::
 119        Activate the list mode. `git branch <pattern>` would try to create a branch,
 120        use `git branch --list <pattern>` to list matching branches.
 121
 122-v::
 123--verbose::
 124        When in list mode,
 125        show sha1 and commit subject line for each head, along with
 126        relationship to upstream branch (if any). If given twice, print
 127        the name of the upstream branch, as well.
 128
 129-q::
 130--quiet::
 131        Be more quiet when creating or deleting a branch, suppressing
 132        non-error messages.
 133
 134--abbrev=<length>::
 135        Alter the sha1's minimum display length in the output listing.
 136        The default value is 7 and can be overridden by the `core.abbrev`
 137        config option.
 138
 139--no-abbrev::
 140        Display the full sha1s in the output listing rather than abbreviating them.
 141
 142-t::
 143--track::
 144        When creating a new branch, set up configuration to mark the
 145        start-point branch as "upstream" from the new branch. This
 146        configuration will tell git to show the relationship between the
 147        two branches in `git status` and `git branch -v`. Furthermore,
 148        it directs `git pull` without arguments to pull from the
 149        upstream when the new branch is checked out.
 150+
 151This behavior is the default when the start point is a remote-tracking branch.
 152Set the branch.autosetupmerge configuration variable to `false` if you
 153want `git checkout` and `git branch` to always behave as if '--no-track'
 154were given. Set it to `always` if you want this behavior when the
 155start-point is either a local or remote-tracking branch.
 156
 157--no-track::
 158        Do not set up "upstream" configuration, even if the
 159        branch.autosetupmerge configuration variable is true.
 160
 161--set-upstream::
 162        If specified branch does not exist yet or if `--force` has been
 163        given, acts exactly like `--track`. Otherwise sets up configuration
 164        like `--track` would when creating the branch, except that where
 165        branch points to is not changed.
 166
 167--edit-description::
 168        Open an editor and edit the text to explain what the branch is
 169        for, to be used by various other commands (e.g. `request-pull`).
 170
 171--contains [<commit>]::
 172        Only list branches which contain the specified commit (HEAD
 173        if not specified).
 174
 175--merged [<commit>]::
 176        Only list branches whose tips are reachable from the
 177        specified commit (HEAD if not specified).
 178
 179--no-merged [<commit>]::
 180        Only list branches whose tips are not reachable from the
 181        specified commit (HEAD if not specified).
 182
 183<branchname>::
 184        The name of the branch to create or delete.
 185        The new branch name must pass all checks defined by
 186        linkgit:git-check-ref-format[1].  Some of these checks
 187        may restrict the characters allowed in a branch name.
 188
 189<start-point>::
 190        The new branch head will point to this commit.  It may be
 191        given as a branch name, a commit-id, or a tag.  If this
 192        option is omitted, the current HEAD will be used instead.
 193
 194<oldbranch>::
 195        The name of an existing branch to rename.
 196
 197<newbranch>::
 198        The new name for an existing branch. The same restrictions as for
 199        <branchname> apply.
 200
 201
 202Examples
 203--------
 204
 205Start development from a known tag::
 206+
 207------------
 208$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
 209$ cd my2.6
 210$ git branch my2.6.14 v2.6.14   <1>
 211$ git checkout my2.6.14
 212------------
 213+
 214<1> This step and the next one could be combined into a single step with
 215"checkout -b my2.6.14 v2.6.14".
 216
 217Delete an unneeded branch::
 218+
 219------------
 220$ git clone git://git.kernel.org/.../git.git my.git
 221$ cd my.git
 222$ git branch -d -r origin/todo origin/html origin/man   <1>
 223$ git branch -D test                                    <2>
 224------------
 225+
 226<1> Delete the remote-tracking branches "todo", "html" and "man". The next
 227'fetch' or 'pull' will create them again unless you configure them not to.
 228See linkgit:git-fetch[1].
 229<2> Delete the "test" branch even if the "master" branch (or whichever branch
 230is currently checked out) does not have all commits from the test branch.
 231
 232
 233Notes
 234-----
 235
 236If you are creating a branch that you want to checkout immediately, it is
 237easier to use the git checkout command with its `-b` option to create
 238a branch and check it out with a single command.
 239
 240The options `--contains`, `--merged` and `--no-merged` serve three related
 241but different purposes:
 242
 243- `--contains <commit>` is used to find all branches which will need
 244  special attention if <commit> were to be rebased or amended, since those
 245  branches contain the specified <commit>.
 246
 247- `--merged` is used to find all branches which can be safely deleted,
 248  since those branches are fully contained by HEAD.
 249
 250- `--no-merged` is used to find branches which are candidates for merging
 251  into HEAD, since those branches are not fully contained by HEAD.
 252
 253SEE ALSO
 254--------
 255linkgit:git-check-ref-format[1],
 256linkgit:git-fetch[1],
 257linkgit:git-remote[1],
 258link:user-manual.html#what-is-a-branch[``Understanding history: What is
 259a branch?''] in the Git User's Manual.
 260
 261GIT
 262---
 263Part of the linkgit:git[1] suite