aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-show-branch.txt
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2006-12-22 08:58:39 -0500
committerJunio C Hamano <junkio@cox.net>2006-12-22 23:18:07 -0800
commitf49006b0c79bb74bc500a9a3a883e929fa0f803e (patch)
tree8afc0965a4cbdf70c8f793c0785e0e625ad23c18 /Documentation/git-show-branch.txt
parentc321f00d09f56dcf2f149757a2a337f3732f3097 (diff)
downloadgit-f49006b0c79bb74bc500a9a3a883e929fa0f803e.tar.gz
git-f49006b0c79bb74bc500a9a3a883e929fa0f803e.tar.xz
Make git-show-branch options similar to git-branch.
Branch has "-r" for remote branches and "-a" for local and remote. It seems logical to mirror that in show-branch. Also removes the dubiously useful "--tags" option (as part of changing the meaning for "--all"). Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-show-branch.txt')
-rw-r--r--Documentation/git-show-branch.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 948ff10e6..dafacd430 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -8,7 +8,7 @@ git-show-branch - Show branches and their commits
SYNOPSIS
--------
[verse]
-'git-show-branch' [--all] [--heads] [--tags] [--topo-order] [--current]
+'git-show-branch' [--all] [--remotes] [--topo-order] [--current]
[--more=<n> | --list | --independent | --merge-base]
[--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
@@ -37,9 +37,11 @@ OPTIONS
branches under $GIT_DIR/refs/heads/topic, giving
`topic/*` would show all of them.
---all --heads --tags::
- Show all refs under $GIT_DIR/refs, $GIT_DIR/refs/heads,
- and $GIT_DIR/refs/tags, respectively.
+-r|--remotes::
+ Show the remote-tracking branches.
+
+-a|--all::
+ Show both remote-tracking branches and local branches.
--current::
With this option, the command includes the current