summaryrefslogtreecommitdiff
path: root/builtin-show-branch.c
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2009-08-05 07:59:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-05 17:28:05 (GMT)
commit995bdc73fe0e28d622af0897440f0ea298345585 (patch)
treeb63d21fb26cd87f2b2ea741898df76007d96ae42 /builtin-show-branch.c
parent30ca4ca7b25082574d93b3a6d46a966d39de0488 (diff)
downloadgit-995bdc73fe0e28d622af0897440f0ea298345585.zip
git-995bdc73fe0e28d622af0897440f0ea298345585.tar.gz
git-995bdc73fe0e28d622af0897440f0ea298345585.tar.bz2
git-merge-base/git-show-branch: Cleanup documentation and usage
Make sure that usage strings and documentation coincide with each other and with the actual code. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-show-branch.c')
-rw-r--r--builtin-show-branch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 01bea3b..03bdea6 100644
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -6,8 +6,8 @@
#include "parse-options.h"
static const char* show_branch_usage[] = {
- "git show-branch [--sparse] [--current] [--all] [--remotes] [--topo-order] [--more=count | --list | --independent | --merge-base] [--topics] [--color] [<refs>...]",
- "--reflog[=n[,b]] [--list] [--color] <branch>",
+ "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [<rev> | <glob>]...",
+ "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]",
NULL
};