summaryrefslogtreecommitdiffstats
path: root/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-23 03:02:50 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-23 03:02:50 +0000
commit57827fb28944ab9eee73efc93f04fb6dfc6e36a8 (patch)
tree935f9e461c67a51943bca7879ec02af645e62d67 /git-branch.txt
parent364b6a4e15285cad6c674f515c0aa3538cfed028 (diff)
downloadgit-htmldocs-57827fb28944ab9eee73efc93f04fb6dfc6e36a8.tar.gz
Autogenerated HTML docs for v1.6.6.1-436-gaba7d
Diffstat (limited to 'git-branch.txt')
-rw-r--r--git-branch.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-branch.txt b/git-branch.txt
index 44144d5a0..6b6c3da2d 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -11,7 +11,7 @@ SYNOPSIS
'git branch' [--color | --no-color] [-r | -a]
[-v [--abbrev=<length> | --no-abbrev]]
[(--merged | --no-merged | --contains) [<commit>]]
-'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
+'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git branch' (-m | -M) [<oldbranch>] <newbranch>
'git branch' (-d | -D) [-r] <branchname>...
@@ -129,6 +129,12 @@ start-point is either a local or remote branch.
Do not set up "upstream" configuration, even if the
branch.autosetupmerge configuration variable is true.
+--set-upstream::
+ If specified branch does not exist yet or if '--force' has been
+ given, acts exactly like '--track'. Otherwise sets up configuration
+ like '--track' would when creating the branch, except that where
+ branch points to is not changed.
+
--contains <commit>::
Only list branches which contain the specified commit.