diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:05 -0800 |
| commit | 1a545d0b5fa56a7be88fe082cec7847715079a18 (patch) | |
| tree | 721ec8d309c6aea0fa3a80eea8d5c1ad07f6bed1 /Documentation/git-branch.txt | |
| parent | 67bc7407211d26de518811dafc2c1cf2e6124709 (diff) | |
| parent | 85e2233f982f760d0e731b1258da2580834d8027 (diff) | |
| download | git-1a545d0b5fa56a7be88fe082cec7847715079a18.tar.gz | |
Merge branch 'il/branch-set-upstream'
* il/branch-set-upstream:
branch: warn and refuse to set a branch as a tracking branch of itself.
Add branch --set-upstream
Diffstat (limited to 'Documentation/git-branch.txt')
| -rw-r--r-- | Documentation/git-branch.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 44144d5a0d..6b6c3da2d9 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/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. |