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