2005-09-08 02:26:23 +02:00
|
|
|
git-branch(1)
|
|
|
|
|
=============
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
|
NAME
|
|
|
|
|
----
|
2007-01-19 00:53:37 +01:00
|
|
|
git-branch - List, create, or delete branches
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
--------
|
2006-03-18 01:24:37 +01:00
|
|
|
[verse]
|
Add an optional argument for --color options
Make git-branch, git-show-branch, git-grep, and all the diff-based
programs accept an optional argument <when> for --color. The argument
is a colorbool: "always", "never", or "auto". If no argument is given,
"always" is used; --no-color is an alias for --color=never. This makes
the command-line interface consistent with other GNU tools, such as `ls'
and `grep', and with the git-config color options. Note that, without
an argument, --color and --no-color work exactly as before.
To implement this, two internal changes were made:
1. Allow the first argument of git_config_colorbool() to be NULL,
in which case it returns -1 if the argument isn't "always", "never",
or "auto".
2. Add OPT_COLOR_FLAG(), OPT__COLOR(), and parse_opt_color_flag_cb()
to the option parsing library. The callback uses
git_config_colorbool(), so color.h is now a dependency
of parse-options.c.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-17 05:55:58 +01:00
|
|
|
'git branch' [--color[=<when>] | --no-color] [-r | -a]
|
2011-08-28 16:54:31 +02:00
|
|
|
[--list] [-v [--abbrev=<length> | --no-abbrev]]
|
2017-03-24 19:40:58 +01:00
|
|
|
[--column[=<options>] | --no-column] [--sort=<key>]
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 19:40:57 +01:00
|
|
|
[(--merged | --no-merged) [<commit>]]
|
2017-03-24 19:40:58 +01:00
|
|
|
[--contains [<commit]] [--no-contains [<commit>]]
|
2017-01-10 09:49:53 +01:00
|
|
|
[--points-at <object>] [--format=<format>] [<pattern>...]
|
2017-11-16 08:46:43 +01:00
|
|
|
'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
|
2012-08-20 15:47:38 +02:00
|
|
|
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
|
2012-08-30 19:23:12 +02:00
|
|
|
'git branch' --unset-upstream [<branchname>]
|
2008-06-30 08:09:04 +02:00
|
|
|
'git branch' (-m | -M) [<oldbranch>] <newbranch>
|
branch: add a --copy (-c) option to go with --move (-m)
Add the ability to --copy a branch and its reflog and configuration,
this uses the same underlying machinery as the --move (-m) option
except the reflog and configuration is copied instead of being moved.
This is useful for e.g. copying a topic branch to a new version,
e.g. work to work-2 after submitting the work topic to the list, while
preserving all the tracking info and other configuration that goes
with the branch, and unlike --move keeping the other already-submitted
branch around for reference.
Like --move, when the source branch is the currently checked out
branch the HEAD is moved to the destination branch. In the case of
--move we don't really have a choice (other than remaining on a
detached HEAD) and in order to keep the functionality consistent, we
are doing it in similar way for --copy too.
The most common usage of this feature is expected to be moving to a
new topic branch which is a copy of the current one, in that case
moving to the target branch is what the user wants, and doesn't
unexpectedly behave differently than --move would.
One outstanding caveat of this implementation is that:
git checkout maint &&
git checkout master &&
git branch -c topic &&
git checkout -
Will check out 'maint' instead of 'master'. This is because the @{-N}
feature (or its -1 shorthand "-") relies on HEAD reflogs created by
the checkout command, so in this case we'll checkout maint instead of
master, as the user might expect. What to do about that is left to a
future change.
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Sahil Dua <sahildua2305@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-18 23:19:16 +02:00
|
|
|
'git branch' (-c | -C) [<oldbranch>] <newbranch>
|
2008-06-30 08:09:04 +02:00
|
|
|
'git branch' (-d | -D) [-r] <branchname>...
|
2011-09-21 00:10:08 +02:00
|
|
|
'git branch' --edit-description [<branchname>]
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
-----------
|
2008-07-09 02:55:47 +02:00
|
|
|
|
2013-01-31 07:45:46 +01:00
|
|
|
If `--list` is given, or if there are no non-option arguments, existing
|
|
|
|
|
branches are listed; the current branch will be highlighted with an
|
|
|
|
|
asterisk. Option `-r` causes the remote-tracking branches to be listed,
|
|
|
|
|
and option `-a` shows both local and remote branches. If a `<pattern>`
|
|
|
|
|
is given, it is used as a shell wildcard to restrict the output to
|
|
|
|
|
matching branches. If multiple patterns are given, a branch is shown if
|
|
|
|
|
it matches any of the patterns. Note that when providing a
|
|
|
|
|
`<pattern>`, you must use `--list`; otherwise the command is interpreted
|
|
|
|
|
as branch creation.
|
2008-07-09 02:55:47 +02:00
|
|
|
|
2009-03-17 07:16:17 +01:00
|
|
|
With `--contains`, shows only the branches that contain the named commit
|
|
|
|
|
(in other words, the branches whose tip commits are descendants of the
|
2017-03-24 19:40:58 +01:00
|
|
|
named commit), `--no-contains` inverts it. With `--merged`, only branches
|
|
|
|
|
merged into the named commit (i.e. the branches whose tip commits are
|
|
|
|
|
reachable from the named commit) will be listed. With `--no-merged` only
|
|
|
|
|
branches not merged into the named commit will be listed. If the <commit>
|
|
|
|
|
argument is missing it defaults to `HEAD` (i.e. the tip of the current
|
|
|
|
|
branch).
|
2005-08-23 10:49:47 +02:00
|
|
|
|
2009-10-09 20:34:08 +02:00
|
|
|
The command's second form creates a new branch head named <branchname>
|
2016-06-28 13:40:15 +02:00
|
|
|
which points to the current `HEAD`, or <start-point> if given.
|
2006-04-28 15:15:04 +02:00
|
|
|
|
2007-10-03 01:34:32 +02:00
|
|
|
Note that this will create the new branch, but it will not switch the
|
|
|
|
|
working tree to it; use "git checkout <newbranch>" to switch to the
|
|
|
|
|
new branch.
|
|
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
When a local branch is started off a remote-tracking branch, Git sets up the
|
2013-09-08 22:58:13 +02:00
|
|
|
branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`
|
|
|
|
|
configuration entries) so that 'git pull' will appropriately merge from
|
2010-11-02 16:31:24 +01:00
|
|
|
the remote-tracking branch. This behavior may be changed via the global
|
2015-03-11 21:32:45 +01:00
|
|
|
`branch.autoSetupMerge` configuration flag. That setting can be
|
2010-11-02 16:31:28 +01:00
|
|
|
overridden by using the `--track` and `--no-track` options, and
|
2012-08-20 15:47:38 +02:00
|
|
|
changed later using `git branch --set-upstream-to`.
|
2007-03-08 10:58:35 +01:00
|
|
|
|
2012-03-06 10:32:43 +01:00
|
|
|
With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>.
|
2006-11-28 15:47:40 +01:00
|
|
|
If <oldbranch> had a corresponding reflog, it is renamed to match
|
|
|
|
|
<newbranch>, and a reflog entry is created to remember the branch
|
|
|
|
|
renaming. If <newbranch> exists, -M must be used to force the rename
|
|
|
|
|
to happen.
|
|
|
|
|
|
branch: add a --copy (-c) option to go with --move (-m)
Add the ability to --copy a branch and its reflog and configuration,
this uses the same underlying machinery as the --move (-m) option
except the reflog and configuration is copied instead of being moved.
This is useful for e.g. copying a topic branch to a new version,
e.g. work to work-2 after submitting the work topic to the list, while
preserving all the tracking info and other configuration that goes
with the branch, and unlike --move keeping the other already-submitted
branch around for reference.
Like --move, when the source branch is the currently checked out
branch the HEAD is moved to the destination branch. In the case of
--move we don't really have a choice (other than remaining on a
detached HEAD) and in order to keep the functionality consistent, we
are doing it in similar way for --copy too.
The most common usage of this feature is expected to be moving to a
new topic branch which is a copy of the current one, in that case
moving to the target branch is what the user wants, and doesn't
unexpectedly behave differently than --move would.
One outstanding caveat of this implementation is that:
git checkout maint &&
git checkout master &&
git branch -c topic &&
git checkout -
Will check out 'maint' instead of 'master'. This is because the @{-N}
feature (or its -1 shorthand "-") relies on HEAD reflogs created by
the checkout command, so in this case we'll checkout maint instead of
master, as the user might expect. What to do about that is left to a
future change.
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Sahil Dua <sahildua2305@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-18 23:19:16 +02:00
|
|
|
The `-c` and `-C` options have the exact same semantics as `-m` and
|
|
|
|
|
`-M`, except instead of the branch being renamed it along with its
|
|
|
|
|
config and reflog will be copied to a new name.
|
|
|
|
|
|
2006-04-28 15:15:04 +02:00
|
|
|
With a `-d` or `-D` option, `<branchname>` will be deleted. You may
|
2006-05-19 11:16:58 +02:00
|
|
|
specify more than one branch for deletion. If the branch currently
|
2007-11-17 20:51:44 +01:00
|
|
|
has a reflog then the reflog will also be deleted.
|
|
|
|
|
|
2012-03-06 10:32:43 +01:00
|
|
|
Use `-r` together with `-d` to delete remote-tracking branches. Note, that it
|
2007-11-17 20:51:44 +01:00
|
|
|
only makes sense to delete remote-tracking branches if they no longer exist
|
2010-01-10 00:33:00 +01:00
|
|
|
in the remote repository or if 'git fetch' was configured not to fetch
|
2009-03-17 07:16:17 +01:00
|
|
|
them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a
|
|
|
|
|
way to clean up all obsolete remote-tracking branches.
|
2006-03-18 01:24:37 +01:00
|
|
|
|
|
|
|
|
|
2005-08-23 10:49:47 +02:00
|
|
|
OPTIONS
|
|
|
|
|
-------
|
2005-11-14 17:53:42 +01:00
|
|
|
-d::
|
2011-08-28 16:54:30 +02:00
|
|
|
--delete::
|
2010-04-15 09:25:38 +02:00
|
|
|
Delete a branch. The branch must be fully merged in its
|
|
|
|
|
upstream branch, or in `HEAD` if no upstream was set with
|
2017-11-16 08:46:43 +01:00
|
|
|
`--track` or `--set-upstream-to`.
|
2005-11-14 17:53:42 +01:00
|
|
|
|
|
|
|
|
-D::
|
2015-07-02 16:07:21 +02:00
|
|
|
Shortcut for `--delete --force`.
|
2005-11-14 17:53:42 +01:00
|
|
|
|
2011-08-28 16:54:30 +02:00
|
|
|
--create-reflog::
|
2007-07-02 07:28:20 +02:00
|
|
|
Create the branch's reflog. This activates recording of
|
|
|
|
|
all changes made to the branch ref, enabling use of date
|
2007-07-02 07:24:59 +02:00
|
|
|
based sha1 expressions such as "<branchname>@\{yesterday}".
|
2010-04-08 21:49:08 +02:00
|
|
|
Note that in non-bare repositories, reflogs are usually
|
2017-09-23 06:56:17 +02:00
|
|
|
enabled by default by the `core.logAllRefUpdates` config option.
|
2017-02-01 23:07:27 +01:00
|
|
|
The negated form `--no-create-reflog` only overrides an earlier
|
|
|
|
|
`--create-reflog`, but currently does not negate the setting of
|
2017-09-23 06:56:17 +02:00
|
|
|
`core.logAllRefUpdates`.
|
branch: deprecate "-l" option
The "-l" option is short for "--create-reflog". This has
caused much confusion over the years. Most people expect it
to work as "--list", because that would match the other
"mode" options like -d/--delete and -m/--move, as well as
the similar -l/--list option of git-tag.
Adding to the confusion, using "-l" _appears_ to work as
"--list" in some cases:
$ git branch -l
* master
because the branch command defaults to listing (so even
trying to specify --list in the command above is redundant).
But that may bite the user later when they add a pattern,
like:
$ git branch -l foo
which does not return an empty list, but in fact creates a
new branch (with a reflog, naturally) called "foo".
It's also probably quite uncommon for people to actually use
"-l" to create a reflog. Since 0bee591869 (Enable reflogs by
default in any repository with a working directory.,
2006-12-14), this is the default in non-bare repositories.
So it's rather unfortunate that the feature squats on the
short-and-sweet "-l" (which was only added in 3a4b3f269c
(Create/delete branch ref logs., 2006-05-19), meaning there
were only 7 months where it was actually useful).
Let's deprecate "-l" in hopes of eventually re-purposing it
to "--list".
Note that we issue the warning only when we're not in list
mode. This means that people for whom it works as a happy
accident, namely:
$ git branch -l
master
won't see the warning at all. And when we eventually switch
to it meaning "--list", that will just continue to work.
We do the issue the warning for these important cases:
- when we are actually creating a branch, in case the user
really did mean it as "--create-reflog"
- when we are in some _other_ mode, like deletion. There
the "-l" is a noop for now, but it will eventually
conflict with any other mode request, and the user
should be told that this is changing.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-22 11:24:14 +02:00
|
|
|
+
|
|
|
|
|
The `-l` option is a deprecated synonym for `--create-reflog`.
|
2006-05-19 11:16:58 +02:00
|
|
|
|
2006-01-29 15:02:51 +01:00
|
|
|
-f::
|
2009-08-29 11:05:00 +02:00
|
|
|
--force::
|
2017-10-18 04:34:31 +02:00
|
|
|
Reset <branchname> to <startpoint>, even if <branchname> exists
|
|
|
|
|
already. Without `-f`, 'git branch' refuses to change an existing branch.
|
2015-07-02 16:07:20 +02:00
|
|
|
In combination with `-d` (or `--delete`), allow deleting the
|
|
|
|
|
branch irrespective of its merged status. In combination with
|
|
|
|
|
`-m` (or `--move`), allow renaming the branch even if the new
|
branch: add a --copy (-c) option to go with --move (-m)
Add the ability to --copy a branch and its reflog and configuration,
this uses the same underlying machinery as the --move (-m) option
except the reflog and configuration is copied instead of being moved.
This is useful for e.g. copying a topic branch to a new version,
e.g. work to work-2 after submitting the work topic to the list, while
preserving all the tracking info and other configuration that goes
with the branch, and unlike --move keeping the other already-submitted
branch around for reference.
Like --move, when the source branch is the currently checked out
branch the HEAD is moved to the destination branch. In the case of
--move we don't really have a choice (other than remaining on a
detached HEAD) and in order to keep the functionality consistent, we
are doing it in similar way for --copy too.
The most common usage of this feature is expected to be moving to a
new topic branch which is a copy of the current one, in that case
moving to the target branch is what the user wants, and doesn't
unexpectedly behave differently than --move would.
One outstanding caveat of this implementation is that:
git checkout maint &&
git checkout master &&
git branch -c topic &&
git checkout -
Will check out 'maint' instead of 'master'. This is because the @{-N}
feature (or its -1 shorthand "-") relies on HEAD reflogs created by
the checkout command, so in this case we'll checkout maint instead of
master, as the user might expect. What to do about that is left to a
future change.
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Sahil Dua <sahildua2305@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-18 23:19:16 +02:00
|
|
|
branch name already exists, the same applies for `-c` (or `--copy`).
|
2006-04-28 15:15:04 +02:00
|
|
|
|
2006-11-28 15:47:40 +01:00
|
|
|
-m::
|
2011-08-28 16:54:30 +02:00
|
|
|
--move::
|
2006-11-28 15:47:40 +01:00
|
|
|
Move/rename a branch and the corresponding reflog.
|
|
|
|
|
|
|
|
|
|
-M::
|
2015-07-02 16:07:21 +02:00
|
|
|
Shortcut for `--move --force`.
|
2006-11-28 15:47:40 +01:00
|
|
|
|
branch: add a --copy (-c) option to go with --move (-m)
Add the ability to --copy a branch and its reflog and configuration,
this uses the same underlying machinery as the --move (-m) option
except the reflog and configuration is copied instead of being moved.
This is useful for e.g. copying a topic branch to a new version,
e.g. work to work-2 after submitting the work topic to the list, while
preserving all the tracking info and other configuration that goes
with the branch, and unlike --move keeping the other already-submitted
branch around for reference.
Like --move, when the source branch is the currently checked out
branch the HEAD is moved to the destination branch. In the case of
--move we don't really have a choice (other than remaining on a
detached HEAD) and in order to keep the functionality consistent, we
are doing it in similar way for --copy too.
The most common usage of this feature is expected to be moving to a
new topic branch which is a copy of the current one, in that case
moving to the target branch is what the user wants, and doesn't
unexpectedly behave differently than --move would.
One outstanding caveat of this implementation is that:
git checkout maint &&
git checkout master &&
git branch -c topic &&
git checkout -
Will check out 'maint' instead of 'master'. This is because the @{-N}
feature (or its -1 shorthand "-") relies on HEAD reflogs created by
the checkout command, so in this case we'll checkout maint instead of
master, as the user might expect. What to do about that is left to a
future change.
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Sahil Dua <sahildua2305@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-06-18 23:19:16 +02:00
|
|
|
-c::
|
|
|
|
|
--copy::
|
|
|
|
|
Copy a branch and the corresponding reflog.
|
|
|
|
|
|
|
|
|
|
-C::
|
|
|
|
|
Shortcut for `--copy --force`.
|
|
|
|
|
|
Add an optional argument for --color options
Make git-branch, git-show-branch, git-grep, and all the diff-based
programs accept an optional argument <when> for --color. The argument
is a colorbool: "always", "never", or "auto". If no argument is given,
"always" is used; --no-color is an alias for --color=never. This makes
the command-line interface consistent with other GNU tools, such as `ls'
and `grep', and with the git-config color options. Note that, without
an argument, --color and --no-color work exactly as before.
To implement this, two internal changes were made:
1. Allow the first argument of git_config_colorbool() to be NULL,
in which case it returns -1 if the argument isn't "always", "never",
or "auto".
2. Add OPT_COLOR_FLAG(), OPT__COLOR(), and parse_opt_color_flag_cb()
to the option parsing library. The callback uses
git_config_colorbool(), so color.h is now a dependency
of parse-options.c.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-17 05:55:58 +01:00
|
|
|
--color[=<when>]::
|
2010-11-02 16:31:24 +01:00
|
|
|
Color branches to highlight current, local, and
|
|
|
|
|
remote-tracking branches.
|
Add an optional argument for --color options
Make git-branch, git-show-branch, git-grep, and all the diff-based
programs accept an optional argument <when> for --color. The argument
is a colorbool: "always", "never", or "auto". If no argument is given,
"always" is used; --no-color is an alias for --color=never. This makes
the command-line interface consistent with other GNU tools, such as `ls'
and `grep', and with the git-config color options. Note that, without
an argument, --color and --no-color work exactly as before.
To implement this, two internal changes were made:
1. Allow the first argument of git_config_colorbool() to be NULL,
in which case it returns -1 if the argument isn't "always", "never",
or "auto".
2. Add OPT_COLOR_FLAG(), OPT__COLOR(), and parse_opt_color_flag_cb()
to the option parsing library. The callback uses
git_config_colorbool(), so color.h is now a dependency
of parse-options.c.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-17 05:55:58 +01:00
|
|
|
The value must be always (the default), never, or auto.
|
2007-01-03 16:36:29 +01:00
|
|
|
|
|
|
|
|
--no-color::
|
|
|
|
|
Turn off branch colors, even when the configuration file gives the
|
|
|
|
|
default to color output.
|
Add an optional argument for --color options
Make git-branch, git-show-branch, git-grep, and all the diff-based
programs accept an optional argument <when> for --color. The argument
is a colorbool: "always", "never", or "auto". If no argument is given,
"always" is used; --no-color is an alias for --color=never. This makes
the command-line interface consistent with other GNU tools, such as `ls'
and `grep', and with the git-config color options. Note that, without
an argument, --color and --no-color work exactly as before.
To implement this, two internal changes were made:
1. Allow the first argument of git_config_colorbool() to be NULL,
in which case it returns -1 if the argument isn't "always", "never",
or "auto".
2. Add OPT_COLOR_FLAG(), OPT__COLOR(), and parse_opt_color_flag_cb()
to the option parsing library. The callback uses
git_config_colorbool(), so color.h is now a dependency
of parse-options.c.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-17 05:55:58 +01:00
|
|
|
Same as `--color=never`.
|
2007-01-03 16:36:29 +01:00
|
|
|
|
2016-12-04 03:52:25 +01:00
|
|
|
-i::
|
|
|
|
|
--ignore-case::
|
|
|
|
|
Sorting and filtering branches are case insensitive.
|
|
|
|
|
|
2012-04-13 12:54:38 +02:00
|
|
|
--column[=<options>]::
|
|
|
|
|
--no-column::
|
|
|
|
|
Display branch listing in columns. See configuration variable
|
|
|
|
|
column.branch for option syntax.`--column` and `--no-column`
|
|
|
|
|
without options are equivalent to 'always' and 'never' respectively.
|
|
|
|
|
+
|
|
|
|
|
This option is only applicable in non-verbose mode.
|
|
|
|
|
|
2006-04-28 15:15:04 +02:00
|
|
|
-r::
|
2011-08-28 16:54:30 +02:00
|
|
|
--remotes::
|
2006-12-21 05:18:07 +01:00
|
|
|
List or delete (if used with -d) the remote-tracking branches.
|
2006-11-21 20:31:24 +01:00
|
|
|
|
|
|
|
|
-a::
|
2011-08-28 16:54:30 +02:00
|
|
|
--all::
|
2006-11-21 20:31:24 +01:00
|
|
|
List both remote-tracking branches and local branches.
|
2006-01-29 15:02:51 +01:00
|
|
|
|
2011-08-28 16:54:31 +02:00
|
|
|
--list::
|
2017-03-24 05:17:00 +01:00
|
|
|
List branches. With optional `<pattern>...`, e.g. `git
|
|
|
|
|
branch --list 'maint-*'`, list only the branches that match
|
|
|
|
|
the pattern(s).
|
|
|
|
|
+
|
|
|
|
|
This should not be confused with `git branch -l <branchname>`,
|
|
|
|
|
which creates a branch named `<branchname>` with a reflog.
|
|
|
|
|
See `--create-reflog` above for details.
|
2011-08-28 16:54:31 +02:00
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-v::
|
2012-09-19 01:25:34 +02:00
|
|
|
-vv::
|
2008-06-08 03:36:09 +02:00
|
|
|
--verbose::
|
2011-09-08 23:09:50 +02:00
|
|
|
When in list mode,
|
|
|
|
|
show sha1 and commit subject line for each head, along with
|
2009-04-07 09:16:56 +02:00
|
|
|
relationship to upstream branch (if any). If given twice, print
|
2012-09-19 01:25:34 +02:00
|
|
|
the name of the upstream branch, as well (see also `git remote
|
|
|
|
|
show <remote>`).
|
2006-11-24 14:45:10 +01:00
|
|
|
|
2012-03-27 01:51:06 +02:00
|
|
|
-q::
|
|
|
|
|
--quiet::
|
|
|
|
|
Be more quiet when creating or deleting a branch, suppressing
|
|
|
|
|
non-error messages.
|
|
|
|
|
|
2006-11-24 14:45:10 +01:00
|
|
|
--abbrev=<length>::
|
2009-03-17 07:16:17 +01:00
|
|
|
Alter the sha1's minimum display length in the output listing.
|
2011-07-01 08:06:08 +02:00
|
|
|
The default value is 7 and can be overridden by the `core.abbrev`
|
|
|
|
|
config option.
|
2006-11-24 14:45:10 +01:00
|
|
|
|
2007-03-03 01:31:17 +01:00
|
|
|
--no-abbrev::
|
2009-03-17 07:16:17 +01:00
|
|
|
Display the full sha1s in the output listing rather than abbreviating them.
|
2007-03-03 01:31:17 +01:00
|
|
|
|
2009-04-28 17:21:20 +02:00
|
|
|
-t::
|
2007-10-03 01:33:30 +02:00
|
|
|
--track::
|
2013-09-08 22:58:13 +02:00
|
|
|
When creating a new branch, set up `branch.<name>.remote` and
|
|
|
|
|
`branch.<name>.merge` configuration entries to mark the
|
2009-04-13 13:11:56 +02:00
|
|
|
start-point branch as "upstream" from the new branch. This
|
|
|
|
|
configuration will tell git to show the relationship between the
|
|
|
|
|
two branches in `git status` and `git branch -v`. Furthermore,
|
|
|
|
|
it directs `git pull` without arguments to pull from the
|
|
|
|
|
upstream when the new branch is checked out.
|
|
|
|
|
+
|
2010-11-02 16:31:24 +01:00
|
|
|
This behavior is the default when the start point is a remote-tracking branch.
|
2015-03-11 21:32:45 +01:00
|
|
|
Set the branch.autoSetupMerge configuration variable to `false` if you
|
2016-06-28 13:40:11 +02:00
|
|
|
want `git checkout` and `git branch` to always behave as if `--no-track`
|
2009-04-13 13:11:56 +02:00
|
|
|
were given. Set it to `always` if you want this behavior when the
|
2010-11-02 16:31:24 +01:00
|
|
|
start-point is either a local or remote-tracking branch.
|
2007-10-03 01:33:30 +02:00
|
|
|
|
|
|
|
|
--no-track::
|
2009-04-13 13:11:56 +02:00
|
|
|
Do not set up "upstream" configuration, even if the
|
2015-03-11 21:32:45 +01:00
|
|
|
branch.autoSetupMerge configuration variable is true.
|
2007-10-03 01:33:30 +02:00
|
|
|
|
2010-01-18 21:44:11 +01:00
|
|
|
--set-upstream::
|
2017-08-17 04:54:24 +02:00
|
|
|
As this option had confusing syntax, it is no longer supported.
|
|
|
|
|
Please use `--track` or `--set-upstream-to` instead.
|
2010-01-18 21:44:11 +01:00
|
|
|
|
2012-08-20 15:47:38 +02:00
|
|
|
-u <upstream>::
|
|
|
|
|
--set-upstream-to=<upstream>::
|
|
|
|
|
Set up <branchname>'s tracking information so <upstream> is
|
|
|
|
|
considered <branchname>'s upstream branch. If no <branchname>
|
|
|
|
|
is specified, then it defaults to the current branch.
|
|
|
|
|
|
2012-08-30 19:23:12 +02:00
|
|
|
--unset-upstream::
|
|
|
|
|
Remove the upstream information for <branchname>. If no branch
|
|
|
|
|
is specified it defaults to the current branch.
|
|
|
|
|
|
2011-09-21 00:10:08 +02:00
|
|
|
--edit-description::
|
|
|
|
|
Open an editor and edit the text to explain what the branch is
|
2015-09-14 16:10:53 +02:00
|
|
|
for, to be used by various other commands (e.g. `format-patch`,
|
|
|
|
|
`request-pull`, and `merge` (if enabled)). Multi-line explanations
|
|
|
|
|
may be used.
|
2011-09-21 00:10:08 +02:00
|
|
|
|
2012-03-06 10:32:45 +01:00
|
|
|
--contains [<commit>]::
|
|
|
|
|
Only list branches which contain the specified commit (HEAD
|
2013-01-31 07:46:11 +01:00
|
|
|
if not specified). Implies `--list`.
|
2008-04-18 00:27:08 +02:00
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 19:40:57 +01:00
|
|
|
--no-contains [<commit>]::
|
|
|
|
|
Only list branches which don't contain the specified commit
|
|
|
|
|
(HEAD if not specified). Implies `--list`.
|
|
|
|
|
|
2009-10-09 12:18:58 +02:00
|
|
|
--merged [<commit>]::
|
|
|
|
|
Only list branches whose tips are reachable from the
|
2017-03-21 13:58:49 +01:00
|
|
|
specified commit (HEAD if not specified). Implies `--list`,
|
|
|
|
|
incompatible with `--no-merged`.
|
2008-04-18 00:27:08 +02:00
|
|
|
|
2009-10-09 12:18:58 +02:00
|
|
|
--no-merged [<commit>]::
|
|
|
|
|
Only list branches whose tips are not reachable from the
|
2017-03-21 13:58:49 +01:00
|
|
|
specified commit (HEAD if not specified). Implies `--list`,
|
|
|
|
|
incompatible with `--merged`.
|
2008-04-18 00:27:08 +02:00
|
|
|
|
2005-08-27 03:18:48 +02:00
|
|
|
<branchname>::
|
2005-11-14 17:53:42 +01:00
|
|
|
The name of the branch to create or delete.
|
2006-05-21 03:54:46 +02:00
|
|
|
The new branch name must pass all checks defined by
|
2007-12-29 07:20:38 +01:00
|
|
|
linkgit:git-check-ref-format[1]. Some of these checks
|
2006-05-21 03:54:46 +02:00
|
|
|
may restrict the characters allowed in a branch name.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
2006-01-29 15:02:51 +01:00
|
|
|
<start-point>::
|
2009-10-09 20:34:08 +02:00
|
|
|
The new branch head will point to this commit. It may be
|
|
|
|
|
given as a branch name, a commit-id, or a tag. If this
|
|
|
|
|
option is omitted, the current HEAD will be used instead.
|
2006-04-28 15:15:04 +02:00
|
|
|
|
2006-11-28 15:47:40 +01:00
|
|
|
<oldbranch>::
|
|
|
|
|
The name of an existing branch to rename.
|
|
|
|
|
|
|
|
|
|
<newbranch>::
|
|
|
|
|
The new name for an existing branch. The same restrictions as for
|
2009-03-17 07:16:17 +01:00
|
|
|
<branchname> apply.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
2015-09-23 20:11:12 +02:00
|
|
|
--sort=<key>::
|
|
|
|
|
Sort based on the key given. Prefix `-` to sort in descending
|
|
|
|
|
order of the value. You may use the --sort=<key> option
|
|
|
|
|
multiple times, in which case the last key becomes the primary
|
|
|
|
|
key. The keys supported are the same as those in `git
|
2018-08-16 11:35:08 +02:00
|
|
|
for-each-ref`. Sort order defaults to the value configured for the
|
|
|
|
|
`branch.sort` variable if exists, or to sorting based on the
|
2015-09-23 20:11:12 +02:00
|
|
|
full refname (including `refs/...` prefix). This lists
|
|
|
|
|
detached HEAD (if present) first, then local branches and
|
2018-08-16 11:35:08 +02:00
|
|
|
finally remote-tracking branches. See linkgit:git-config[1].
|
2015-09-23 20:11:12 +02:00
|
|
|
|
2005-12-13 08:24:06 +01:00
|
|
|
|
2015-09-23 20:11:13 +02:00
|
|
|
--points-at <object>::
|
|
|
|
|
Only list branches of the given object.
|
2005-12-13 08:24:06 +01:00
|
|
|
|
2017-01-10 09:49:53 +01:00
|
|
|
--format <format>::
|
2017-08-18 16:51:22 +02:00
|
|
|
A string that interpolates `%(fieldname)` from a branch ref being shown
|
|
|
|
|
and the object it points at. The format is the same as
|
2017-01-10 09:49:53 +01:00
|
|
|
that of linkgit:git-for-each-ref[1].
|
|
|
|
|
|
2017-11-19 16:03:49 +01:00
|
|
|
CONFIGURATION
|
|
|
|
|
-------------
|
|
|
|
|
`pager.branch` is only respected when listing branches, i.e., when
|
2017-11-19 16:03:50 +01:00
|
|
|
`--list` is used or implied. The default is to use a pager.
|
2017-11-19 16:03:49 +01:00
|
|
|
See linkgit:git-config[1].
|
|
|
|
|
|
2018-04-30 17:35:33 +02:00
|
|
|
EXAMPLES
|
2006-04-28 15:15:04 +02:00
|
|
|
--------
|
2005-12-13 08:24:06 +01:00
|
|
|
|
2009-03-17 07:16:17 +01:00
|
|
|
Start development from a known tag::
|
2005-12-13 08:24:06 +01:00
|
|
|
+
|
|
|
|
|
------------
|
|
|
|
|
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
|
|
|
|
|
$ cd my2.6
|
2006-04-28 15:15:04 +02:00
|
|
|
$ git branch my2.6.14 v2.6.14 <1>
|
2005-12-13 08:24:06 +01:00
|
|
|
$ git checkout my2.6.14
|
|
|
|
|
------------
|
2006-04-28 15:15:04 +02:00
|
|
|
+
|
|
|
|
|
<1> This step and the next one could be combined into a single step with
|
|
|
|
|
"checkout -b my2.6.14 v2.6.14".
|
2005-12-13 08:24:06 +01:00
|
|
|
|
2009-03-17 07:16:17 +01:00
|
|
|
Delete an unneeded branch::
|
2005-12-13 08:24:06 +01:00
|
|
|
+
|
|
|
|
|
------------
|
|
|
|
|
$ git clone git://git.kernel.org/.../git.git my.git
|
|
|
|
|
$ cd my.git
|
2007-07-16 13:38:47 +02:00
|
|
|
$ git branch -d -r origin/todo origin/html origin/man <1>
|
|
|
|
|
$ git branch -D test <2>
|
2006-04-28 15:15:04 +02:00
|
|
|
------------
|
|
|
|
|
+
|
2009-03-17 07:16:17 +01:00
|
|
|
<1> Delete the remote-tracking branches "todo", "html" and "man". The next
|
|
|
|
|
'fetch' or 'pull' will create them again unless you configure them not to.
|
|
|
|
|
See linkgit:git-fetch[1].
|
|
|
|
|
<2> Delete the "test" branch even if the "master" branch (or whichever branch
|
|
|
|
|
is currently checked out) does not have all commits from the test branch.
|
2006-04-28 15:15:04 +02:00
|
|
|
|
|
|
|
|
|
2018-04-30 17:35:33 +02:00
|
|
|
NOTES
|
2006-04-28 15:15:04 +02:00
|
|
|
-----
|
|
|
|
|
|
2009-03-17 07:16:17 +01:00
|
|
|
If you are creating a branch that you want to checkout immediately, it is
|
2006-04-28 15:15:04 +02:00
|
|
|
easier to use the git checkout command with its `-b` option to create
|
|
|
|
|
a branch and check it out with a single command.
|
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 19:40:57 +01:00
|
|
|
The options `--contains`, `--no-contains`, `--merged` and `--no-merged`
|
|
|
|
|
serve four related but different purposes:
|
2008-04-18 00:27:08 +02:00
|
|
|
|
|
|
|
|
- `--contains <commit>` is used to find all branches which will need
|
|
|
|
|
special attention if <commit> were to be rebased or amended, since those
|
|
|
|
|
branches contain the specified <commit>.
|
|
|
|
|
|
ref-filter: add --no-contains option to tag/branch/for-each-ref
Change the tag, branch & for-each-ref commands to have a --no-contains
option in addition to their longstanding --contains options.
This allows for finding the last-good rollout tag given a known-bad
<commit>. Given a hypothetically bad commit cf5c7253e0, the git
version to revert to can be found with this hacky two-liner:
(git tag -l 'v[0-9]*'; git tag -l --contains cf5c7253e0 'v[0-9]*') |
sort | uniq -c | grep -E '^ *1 ' | awk '{print $2}' | tail -n 10
With this new --no-contains option the same can be achieved with:
git tag -l --no-contains cf5c7253e0 'v[0-9]*' | sort | tail -n 10
As the filtering machinery is shared between the tag, branch &
for-each-ref commands, implement this for those commands too. A
practical use for this with "branch" is e.g. finding branches which
were branched off between v2.8.0 and v2.10.0:
git branch --contains v2.8.0 --no-contains v2.10.0
The "describe" command also has a --contains option, but its semantics
are unrelated to what tag/branch/for-each-ref use --contains for. A
--no-contains option for "describe" wouldn't make any sense, other
than being exactly equivalent to not supplying --contains at all,
which would be confusing at best.
Add a --without option to "tag" as an alias for --no-contains, for
consistency with --with and --contains. The --with option is
undocumented, and possibly the only user of it is
Junio (<xmqqefy71iej.fsf@gitster.mtv.corp.google.com>). But it's
trivial to support, so let's do that.
The additions to the the test suite are inverse copies of the
corresponding --contains tests. With this change --no-contains for
tag, branch & for-each-ref is just as well tested as the existing
--contains option.
In addition to those tests, add a test for "tag" which asserts that
--no-contains won't find tree/blob tags, which is slightly
unintuitive, but consistent with how --contains works & is documented.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24 19:40:57 +01:00
|
|
|
- `--no-contains <commit>` is the inverse of that, i.e. branches that don't
|
|
|
|
|
contain the specified <commit>.
|
|
|
|
|
|
2008-04-18 00:27:08 +02:00
|
|
|
- `--merged` is used to find all branches which can be safely deleted,
|
|
|
|
|
since those branches are fully contained by HEAD.
|
|
|
|
|
|
|
|
|
|
- `--no-merged` is used to find branches which are candidates for merging
|
|
|
|
|
into HEAD, since those branches are not fully contained by HEAD.
|
2005-12-13 08:24:06 +01:00
|
|
|
|
2009-08-22 02:45:18 +02:00
|
|
|
SEE ALSO
|
|
|
|
|
--------
|
|
|
|
|
linkgit:git-check-ref-format[1],
|
|
|
|
|
linkgit:git-fetch[1],
|
2009-10-09 20:34:08 +02:00
|
|
|
linkgit:git-remote[1],
|
|
|
|
|
link:user-manual.html#what-is-a-branch[``Understanding history: What is
|
|
|
|
|
a branch?''] in the Git User's Manual.
|
2009-08-22 02:45:18 +02:00
|
|
|
|
2005-08-23 10:49:47 +02:00
|
|
|
GIT
|
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|