2005-09-08 00:26:23 +00:00
|
|
|
git-branch(1)
|
|
|
|
=============
|
2005-08-23 08:49:47 +00:00
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2007-01-18 23:53:37 +00:00
|
|
|
git-branch - List, create, or delete branches
|
2005-08-23 08:49:47 +00:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2006-03-18 00:24:37 +00: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 04:55:58 +00:00
|
|
|
'git branch' [--color[=<when>] | --no-color] [-r | -a]
|
2011-08-28 14:54:31 +00:00
|
|
|
[--list] [-v [--abbrev=<length> | --no-abbrev]]
|
2017-03-24 18:40:58 +00: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 18:40:57 +00:00
|
|
|
[(--merged | --no-merged) [<commit>]]
|
2017-03-24 18:40:58 +00:00
|
|
|
[--contains [<commit]] [--no-contains [<commit>]]
|
2017-01-10 08:49:53 +00:00
|
|
|
[--points-at <object>] [--format=<format>] [<pattern>...]
|
2010-01-18 20:44:11 +00:00
|
|
|
'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
|
2012-08-20 13:47:38 +00:00
|
|
|
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
|
2012-08-30 17:23:12 +00:00
|
|
|
'git branch' --unset-upstream [<branchname>]
|
2008-06-30 06:09:04 +00:00
|
|
|
'git branch' (-m | -M) [<oldbranch>] <newbranch>
|
|
|
|
'git branch' (-d | -D) [-r] <branchname>...
|
2011-09-20 22:10:08 +00:00
|
|
|
'git branch' --edit-description [<branchname>]
|
2005-08-23 08:49:47 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2008-07-09 00:55:47 +00:00
|
|
|
|
2013-01-31 06:45:46 +00: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 00:55:47 +00:00
|
|
|
|
2009-03-17 06:16:17 +00: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 18:40:58 +00: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 08:49:47 +00:00
|
|
|
|
2009-10-09 18:34:08 +00:00
|
|
|
The command's second form creates a new branch head named <branchname>
|
2016-06-28 11:40:15 +00:00
|
|
|
which points to the current `HEAD`, or <start-point> if given.
|
2006-04-28 13:15:04 +00:00
|
|
|
|
2007-10-02 23:34:32 +00: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 19:17:53 +00:00
|
|
|
When a local branch is started off a remote-tracking branch, Git sets up the
|
2013-09-08 20:58:13 +00:00
|
|
|
branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`
|
|
|
|
configuration entries) so that 'git pull' will appropriately merge from
|
2010-11-02 15:31:24 +00:00
|
|
|
the remote-tracking branch. This behavior may be changed via the global
|
2015-03-11 20:32:45 +00:00
|
|
|
`branch.autoSetupMerge` configuration flag. That setting can be
|
2010-11-02 15:31:28 +00:00
|
|
|
overridden by using the `--track` and `--no-track` options, and
|
2012-08-20 13:47:38 +00:00
|
|
|
changed later using `git branch --set-upstream-to`.
|
2007-03-08 09:58:35 +00:00
|
|
|
|
2012-03-06 09:32:43 +00:00
|
|
|
With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>.
|
2006-11-28 14:47:40 +00: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.
|
|
|
|
|
2006-04-28 13:15:04 +00:00
|
|
|
With a `-d` or `-D` option, `<branchname>` will be deleted. You may
|
2006-05-19 09:16:58 +00:00
|
|
|
specify more than one branch for deletion. If the branch currently
|
2007-11-17 19:51:44 +00:00
|
|
|
has a reflog then the reflog will also be deleted.
|
|
|
|
|
2012-03-06 09:32:43 +00:00
|
|
|
Use `-r` together with `-d` to delete remote-tracking branches. Note, that it
|
2007-11-17 19:51:44 +00:00
|
|
|
only makes sense to delete remote-tracking branches if they no longer exist
|
2010-01-09 23:33:00 +00:00
|
|
|
in the remote repository or if 'git fetch' was configured not to fetch
|
2009-03-17 06:16:17 +00: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 00:24:37 +00:00
|
|
|
|
|
|
|
|
2005-08-23 08:49:47 +00:00
|
|
|
OPTIONS
|
|
|
|
-------
|
2005-11-14 16:53:42 +00:00
|
|
|
-d::
|
2011-08-28 14:54:30 +00:00
|
|
|
--delete::
|
2010-04-15 07:25:38 +00:00
|
|
|
Delete a branch. The branch must be fully merged in its
|
|
|
|
upstream branch, or in `HEAD` if no upstream was set with
|
|
|
|
`--track` or `--set-upstream`.
|
2005-11-14 16:53:42 +00:00
|
|
|
|
|
|
|
-D::
|
2015-07-02 14:07:21 +00:00
|
|
|
Shortcut for `--delete --force`.
|
2005-11-14 16:53:42 +00:00
|
|
|
|
2006-05-19 09:16:58 +00:00
|
|
|
-l::
|
2011-08-28 14:54:30 +00:00
|
|
|
--create-reflog::
|
2007-07-02 05:28:20 +00:00
|
|
|
Create the branch's reflog. This activates recording of
|
|
|
|
all changes made to the branch ref, enabling use of date
|
2007-07-02 05:24:59 +00:00
|
|
|
based sha1 expressions such as "<branchname>@\{yesterday}".
|
2010-04-08 19:49:08 +00:00
|
|
|
Note that in non-bare repositories, reflogs are usually
|
|
|
|
enabled by default by the `core.logallrefupdates` config option.
|
2017-02-01 22:07:27 +00:00
|
|
|
The negated form `--no-create-reflog` only overrides an earlier
|
|
|
|
`--create-reflog`, but currently does not negate the setting of
|
|
|
|
`core.logallrefupdates`.
|
2006-05-19 09:16:58 +00:00
|
|
|
|
2006-01-29 14:02:51 +00:00
|
|
|
-f::
|
2009-08-29 09:05:00 +00:00
|
|
|
--force::
|
2009-03-17 14:06:20 +00:00
|
|
|
Reset <branchname> to <startpoint> if <branchname> exists
|
2010-01-09 23:33:00 +00:00
|
|
|
already. Without `-f` 'git branch' refuses to change an existing branch.
|
2015-07-02 14:07:20 +00: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 name already exists.
|
2006-04-28 13:15:04 +00:00
|
|
|
|
2006-11-28 14:47:40 +00:00
|
|
|
-m::
|
2011-08-28 14:54:30 +00:00
|
|
|
--move::
|
2006-11-28 14:47:40 +00:00
|
|
|
Move/rename a branch and the corresponding reflog.
|
|
|
|
|
|
|
|
-M::
|
2015-07-02 14:07:21 +00:00
|
|
|
Shortcut for `--move --force`.
|
2006-11-28 14:47:40 +00:00
|
|
|
|
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 04:55:58 +00:00
|
|
|
--color[=<when>]::
|
2010-11-02 15:31:24 +00: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 04:55:58 +00:00
|
|
|
The value must be always (the default), never, or auto.
|
2007-01-03 15:36:29 +00: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 04:55:58 +00:00
|
|
|
Same as `--color=never`.
|
2007-01-03 15:36:29 +00:00
|
|
|
|
2016-12-04 02:52:25 +00:00
|
|
|
-i::
|
|
|
|
--ignore-case::
|
|
|
|
Sorting and filtering branches are case insensitive.
|
|
|
|
|
2012-04-13 10:54:38 +00: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 13:15:04 +00:00
|
|
|
-r::
|
2011-08-28 14:54:30 +00:00
|
|
|
--remotes::
|
2006-12-21 04:18:07 +00:00
|
|
|
List or delete (if used with -d) the remote-tracking branches.
|
2006-11-21 19:31:24 +00:00
|
|
|
|
|
|
|
-a::
|
2011-08-28 14:54:30 +00:00
|
|
|
--all::
|
2006-11-21 19:31:24 +00:00
|
|
|
List both remote-tracking branches and local branches.
|
2006-01-29 14:02:51 +00:00
|
|
|
|
2011-08-28 14:54:31 +00:00
|
|
|
--list::
|
2017-03-24 04:17:00 +00: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 14:54:31 +00:00
|
|
|
|
2008-06-08 01:36:09 +00:00
|
|
|
-v::
|
2012-09-18 23:25:34 +00:00
|
|
|
-vv::
|
2008-06-08 01:36:09 +00:00
|
|
|
--verbose::
|
2011-09-08 21:09:50 +00:00
|
|
|
When in list mode,
|
|
|
|
show sha1 and commit subject line for each head, along with
|
2009-04-07 07:16:56 +00:00
|
|
|
relationship to upstream branch (if any). If given twice, print
|
2012-09-18 23:25:34 +00:00
|
|
|
the name of the upstream branch, as well (see also `git remote
|
|
|
|
show <remote>`).
|
2006-11-24 13:45:10 +00:00
|
|
|
|
2012-03-26 23:51:06 +00:00
|
|
|
-q::
|
|
|
|
--quiet::
|
|
|
|
Be more quiet when creating or deleting a branch, suppressing
|
|
|
|
non-error messages.
|
|
|
|
|
2006-11-24 13:45:10 +00:00
|
|
|
--abbrev=<length>::
|
2009-03-17 06:16:17 +00:00
|
|
|
Alter the sha1's minimum display length in the output listing.
|
2011-07-01 06:06:08 +00:00
|
|
|
The default value is 7 and can be overridden by the `core.abbrev`
|
|
|
|
config option.
|
2006-11-24 13:45:10 +00:00
|
|
|
|
2007-03-03 00:31:17 +00:00
|
|
|
--no-abbrev::
|
2009-03-17 06:16:17 +00:00
|
|
|
Display the full sha1s in the output listing rather than abbreviating them.
|
2007-03-03 00:31:17 +00:00
|
|
|
|
2009-04-28 15:21:20 +00:00
|
|
|
-t::
|
2007-10-02 23:33:30 +00:00
|
|
|
--track::
|
2013-09-08 20:58:13 +00:00
|
|
|
When creating a new branch, set up `branch.<name>.remote` and
|
|
|
|
`branch.<name>.merge` configuration entries to mark the
|
2009-04-13 11:11:56 +00: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 15:31:24 +00:00
|
|
|
This behavior is the default when the start point is a remote-tracking branch.
|
2015-03-11 20:32:45 +00:00
|
|
|
Set the branch.autoSetupMerge configuration variable to `false` if you
|
2016-06-28 11:40:11 +00:00
|
|
|
want `git checkout` and `git branch` to always behave as if `--no-track`
|
2009-04-13 11:11:56 +00:00
|
|
|
were given. Set it to `always` if you want this behavior when the
|
2010-11-02 15:31:24 +00:00
|
|
|
start-point is either a local or remote-tracking branch.
|
2007-10-02 23:33:30 +00:00
|
|
|
|
|
|
|
--no-track::
|
2009-04-13 11:11:56 +00:00
|
|
|
Do not set up "upstream" configuration, even if the
|
2015-03-11 20:32:45 +00:00
|
|
|
branch.autoSetupMerge configuration variable is true.
|
2007-10-02 23:33:30 +00:00
|
|
|
|
2010-01-18 20:44:11 +00:00
|
|
|
--set-upstream::
|
2017-08-17 02:54:24 +00:00
|
|
|
As this option had confusing syntax, it is no longer supported.
|
|
|
|
Please use `--track` or `--set-upstream-to` instead.
|
2010-01-18 20:44:11 +00:00
|
|
|
|
2012-08-20 13:47:38 +00: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 17:23:12 +00:00
|
|
|
--unset-upstream::
|
|
|
|
Remove the upstream information for <branchname>. If no branch
|
|
|
|
is specified it defaults to the current branch.
|
|
|
|
|
2011-09-20 22:10:08 +00:00
|
|
|
--edit-description::
|
|
|
|
Open an editor and edit the text to explain what the branch is
|
2015-09-14 14:10:53 +00: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-20 22:10:08 +00:00
|
|
|
|
2012-03-06 09:32:45 +00:00
|
|
|
--contains [<commit>]::
|
|
|
|
Only list branches which contain the specified commit (HEAD
|
2013-01-31 06:46:11 +00:00
|
|
|
if not specified). Implies `--list`.
|
2008-04-17 22:27:08 +00: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 18:40:57 +00:00
|
|
|
--no-contains [<commit>]::
|
|
|
|
Only list branches which don't contain the specified commit
|
|
|
|
(HEAD if not specified). Implies `--list`.
|
|
|
|
|
2009-10-09 10:18:58 +00:00
|
|
|
--merged [<commit>]::
|
|
|
|
Only list branches whose tips are reachable from the
|
2017-03-21 12:58:49 +00:00
|
|
|
specified commit (HEAD if not specified). Implies `--list`,
|
|
|
|
incompatible with `--no-merged`.
|
2008-04-17 22:27:08 +00:00
|
|
|
|
2009-10-09 10:18:58 +00:00
|
|
|
--no-merged [<commit>]::
|
|
|
|
Only list branches whose tips are not reachable from the
|
2017-03-21 12:58:49 +00:00
|
|
|
specified commit (HEAD if not specified). Implies `--list`,
|
|
|
|
incompatible with `--merged`.
|
2008-04-17 22:27:08 +00:00
|
|
|
|
2005-08-27 01:18:48 +00:00
|
|
|
<branchname>::
|
2005-11-14 16:53:42 +00:00
|
|
|
The name of the branch to create or delete.
|
2006-05-21 01:54:46 +00:00
|
|
|
The new branch name must pass all checks defined by
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-check-ref-format[1]. Some of these checks
|
2006-05-21 01:54:46 +00:00
|
|
|
may restrict the characters allowed in a branch name.
|
2005-08-23 08:49:47 +00:00
|
|
|
|
2006-01-29 14:02:51 +00:00
|
|
|
<start-point>::
|
2009-10-09 18:34:08 +00: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 13:15:04 +00:00
|
|
|
|
2006-11-28 14:47:40 +00: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 06:16:17 +00:00
|
|
|
<branchname> apply.
|
2005-08-23 08:49:47 +00:00
|
|
|
|
2015-09-23 18:11:12 +00: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
|
|
|
|
for-each-ref`. Sort order defaults to sorting based on the
|
|
|
|
full refname (including `refs/...` prefix). This lists
|
|
|
|
detached HEAD (if present) first, then local branches and
|
|
|
|
finally remote-tracking branches.
|
|
|
|
|
2005-12-13 07:24:06 +00:00
|
|
|
|
2015-09-23 18:11:13 +00:00
|
|
|
--points-at <object>::
|
|
|
|
Only list branches of the given object.
|
2005-12-13 07:24:06 +00:00
|
|
|
|
2017-01-10 08:49:53 +00:00
|
|
|
--format <format>::
|
2017-08-18 14:51:22 +00: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 08:49:53 +00:00
|
|
|
that of linkgit:git-for-each-ref[1].
|
|
|
|
|
2005-12-13 07:24:06 +00:00
|
|
|
Examples
|
2006-04-28 13:15:04 +00:00
|
|
|
--------
|
2005-12-13 07:24:06 +00:00
|
|
|
|
2009-03-17 06:16:17 +00:00
|
|
|
Start development from a known tag::
|
2005-12-13 07:24:06 +00:00
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
|
|
|
|
$ cd my2.6
|
2006-04-28 13:15:04 +00:00
|
|
|
$ git branch my2.6.14 v2.6.14 <1>
|
2005-12-13 07:24:06 +00:00
|
|
|
$ git checkout my2.6.14
|
|
|
|
------------
|
2006-04-28 13:15:04 +00: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 07:24:06 +00:00
|
|
|
|
2009-03-17 06:16:17 +00:00
|
|
|
Delete an unneeded branch::
|
2005-12-13 07:24:06 +00:00
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git clone git://git.kernel.org/.../git.git my.git
|
|
|
|
$ cd my.git
|
2007-07-16 11:38:47 +00:00
|
|
|
$ git branch -d -r origin/todo origin/html origin/man <1>
|
|
|
|
$ git branch -D test <2>
|
2006-04-28 13:15:04 +00:00
|
|
|
------------
|
|
|
|
+
|
2009-03-17 06:16:17 +00: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 13:15:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
Notes
|
|
|
|
-----
|
|
|
|
|
2009-03-17 06:16:17 +00:00
|
|
|
If you are creating a branch that you want to checkout immediately, it is
|
2006-04-28 13:15:04 +00: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 18:40:57 +00:00
|
|
|
The options `--contains`, `--no-contains`, `--merged` and `--no-merged`
|
|
|
|
serve four related but different purposes:
|
2008-04-17 22:27:08 +00: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 18:40:57 +00:00
|
|
|
- `--no-contains <commit>` is the inverse of that, i.e. branches that don't
|
|
|
|
contain the specified <commit>.
|
|
|
|
|
2008-04-17 22:27:08 +00: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 07:24:06 +00:00
|
|
|
|
2009-08-22 00:45:18 +00:00
|
|
|
SEE ALSO
|
|
|
|
--------
|
|
|
|
linkgit:git-check-ref-format[1],
|
|
|
|
linkgit:git-fetch[1],
|
2009-10-09 18:34:08 +00: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 00:45:18 +00:00
|
|
|
|
2005-08-23 08:49:47 +00:00
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 07:07:32 +00:00
|
|
|
Part of the linkgit:git[1] suite
|