diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-21 16:26:42 -0700 |
| commit | f7bff60de95951d2c82601350cb3771b347e83ee (patch) | |
| tree | 5c0e747a86d4990b4e5b7176cec670de620dabe8 /Documentation/git-show-branch.txt | |
| parent | 75a2f301676aefb85c4f67da613cad2405e77927 (diff) | |
| parent | d0bb13663000be47d83cbe53b6c4bdc8835625cb (diff) | |
| download | git-f7bff60de95951d2c82601350cb3771b347e83ee.tar.gz git-f7bff60de95951d2c82601350cb3771b347e83ee.tar.xz | |
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
Diffstat (limited to 'Documentation/git-show-branch.txt')
| -rw-r--r-- | Documentation/git-show-branch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 8dbcf1acd..3b0c88271 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -12,7 +12,7 @@ SYNOPSIS [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] - [<rev> | <glob>]... + [(<rev> | <glob>)...] 'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>] |