diff options
author | Michael J Gruber <git@drmicha.warpmail.net> | 2011-09-08 14:09:50 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-09-08 14:11:35 -0700 |
commit | 7b787599e4f45784c36e82030d0f6bae72817bfc (patch) | |
tree | 275356755ae46606cc27b306d7203dbd2dfbb56c /Documentation/git-branch.txt | |
parent | branch: allow pattern arguments (diff) | |
download | tgif-7b787599e4f45784c36e82030d0f6bae72817bfc.tar.xz |
branch: -v does not automatically imply --list
"branch -v" without other options or parameters still works in the list
mode, but that is not because there is "-v" but because there is no
parameter nor option.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r-- | Documentation/git-branch.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 2b8bc84ae0..f46013c91f 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -21,7 +21,7 @@ DESCRIPTION With no arguments, existing branches are listed and the current branch will be highlighted with an asterisk. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both. This list mode is also -activated by the `--list` and `-v` options (see below). +activated by the `--list` option (see below). <pattern> restricts the output to matching branches, the pattern is a shell wildcard (i.e., matched using fnmatch(3)) Multiple patterns may be given; if any of them matches, the tag is shown. @@ -120,10 +120,10 @@ OPTIONS -v:: --verbose:: - Show sha1 and commit subject line for each head, along with + When in list mode, + show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the name of the upstream branch, as well. - `--list` is implied by all verbosity options. --abbrev=<length>:: Alter the sha1's minimum display length in the output listing. |