diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-07 02:21:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-07 02:29:00 (GMT) |
| commit | 8048e24b87b2b897acaa27fe37df715f354947cb (patch) | |
| tree | 9e415b9768c71ec6aa52f2cbe3d4fb1ba1a53e90 | |
| parent | bf928e9d2cf124ed73711f90666f9cee3c084e59 (diff) | |
| download | git-8048e24b87b2b897acaa27fe37df715f354947cb.zip git-8048e24b87b2b897acaa27fe37df715f354947cb.tar.gz git-8048e24b87b2b897acaa27fe37df715f354947cb.tar.bz2 | |
show-branch: match documentation and usage
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-show-branch.txt | 5 | ||||
| -rw-r--r-- | builtin-show-branch.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index f115b45..a2445a4 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -52,6 +52,11 @@ OPTIONS appear in topological order (i.e., descendant commits are shown before their parents). +--sparse:: + By default, the output omits merges that are reachable + from only one tip being shown. This option makes them + visible. + --more=<n>:: Usually the command stops output upon showing the commit that is the common ancestor of all the branches. This diff --git a/builtin-show-branch.c b/builtin-show-branch.c index 09d8227..260cb22 100644 --- a/builtin-show-branch.c +++ b/builtin-show-branch.c @@ -6,7 +6,7 @@ #include "builtin.h" static const char show_branch_usage[] = -"git-show-branch [--dense] [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]"; +"git-show-branch [--sparse] [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]"; static int default_num = 0; static int default_alloc = 0; |