From: Junio C Hamano <junkio@cox.net>
Date: Fri, 7 Jul 2006 02:21:47 +0000 (-0700)
Subject: show-branch: match documentation and usage
X-Git-Tag: v1.4.2-rc1~76
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8048e24b87b2b897acaa27fe37df715f354947cb;p=git.git

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 f115b45ef..a2445a48f 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 09d822786..260cb221b 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;