show-branch: match documentation and usage

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index f115b45ef61567b18f6686d12dd168e68f83cb02..a2445a48fc98ddd4865bab8d3033880a854fca36 100644 (file)
--- 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).
 
         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
 --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 09d82278625584213f710a984652a7efc07339c5..260cb221b902aa05d389f79988434770ed8c9131 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -6,7 +6,7 @@
 #include "builtin.h"
 
 static const char show_branch_usage[] =
 #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;
 
 static int default_num = 0;
 static int default_alloc = 0;