summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-11-24 03:43:46 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-11-24 03:43:46 -0800
commit5b6be4ccb5fe45fba7ab6b9c332ed96ca806693f (patch)
treebc49211263e7181eb51d368e20bf575313948d4b /Documentation
parentMerge branch 'ap/prune' (diff)
parentAdd support to git-branch to show local and remote branches (diff)
downloadtgif-5b6be4ccb5fe45fba7ab6b9c332ed96ca806693f.tar.xz
Merge branch 'ap/branch-ref-display'
* ap/branch-ref-display: Add support to git-branch to show local and remote branches
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-branch.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d43ef1dec4..5376760813 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -8,14 +8,16 @@ git-branch - List, create, or delete branches.
SYNOPSIS
--------
[verse]
-'git-branch' [-r]
+'git-branch' [-r] [-a]
'git-branch' [-l] [-f] <branchname> [<start-point>]
'git-branch' (-d | -D) <branchname>...
DESCRIPTION
-----------
-With no arguments given (or just `-r`) a list of available branches
+With no arguments given a list of existing branches
will be shown, the current branch will be highlighted with an asterisk.
+Option `-r` causes the remote-tracking branches to be listed,
+and option `-a` shows both.
In its 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>.
@@ -45,7 +47,10 @@ OPTIONS
a branch that already exists with the same name.
-r::
- List only the "remote" branches.
+ List the remote-tracking branches.
+
+-a::
+ List both remote-tracking branches and local branches.
<branchname>::
The name of the branch to create or delete.