summaryrefslogtreecommitdiffstats
path: root/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-10-10 00:56:29 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-10-10 00:56:29 +0000
commitc0e55e76f42a06dfbb4ede27d35f6bdb8cae1f01 (patch)
tree3d14a6b26152cf3e014eafe48918109b2cc7cbf4 /git-branch.txt
parent0e5cb1e4d7480845f839da2ee71c267ee054f758 (diff)
downloadgit-htmldocs-c0e55e76f42a06dfbb4ede27d35f6bdb8cae1f01.tar.gz
Autogenerated HTML docs for v1.6.5-rc3-35-g3340
Diffstat (limited to 'git-branch.txt')
-rw-r--r--git-branch.txt26
1 files changed, 14 insertions, 12 deletions
diff --git a/git-branch.txt b/git-branch.txt
index aad71dc59..0e836809c 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -30,10 +30,8 @@ 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).
-In the command's second form, a new branch named <branchname> will be created.
-It will start out with a head equal to the one given as <start-point>.
-If no <start-point> is given, the branch will be created with a head
-equal to that of the currently checked out branch.
+The command's second form creates a new branch head named <branchname>
+which points to the current 'HEAD', or <start-point> if given.
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
@@ -134,11 +132,13 @@ start-point is either a local or remote branch.
--contains <commit>::
Only list branches which contain the specified commit.
---merged::
- Only list branches which are fully contained by HEAD.
+--merged [<commit>]::
+ Only list branches whose tips are reachable from the
+ specified commit (HEAD if not specified).
---no-merged::
- Do not list branches which are fully contained by HEAD.
+--no-merged [<commit>]::
+ Only list branches whose tips are not reachable from the
+ specified commit (HEAD if not specified).
<branchname>::
The name of the branch to create or delete.
@@ -147,9 +147,9 @@ start-point is either a local or remote branch.
may restrict the characters allowed in a branch name.
<start-point>::
- The new branch will be created with a HEAD equal to this. It may
- be given as a branch name, a commit-id, or a tag. If this option
- is omitted, the current branch is assumed.
+ 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.
<oldbranch>::
The name of an existing branch to rename.
@@ -214,7 +214,9 @@ SEE ALSO
--------
linkgit:git-check-ref-format[1],
linkgit:git-fetch[1],
-linkgit:git-remote[1].
+linkgit:git-remote[1],
+link:user-manual.html#what-is-a-branch[``Understanding history: What is
+a branch?''] in the Git User's Manual.
Author
------