diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:37:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:37:07 -0800 |
| commit | d62078e9107f01c902c260e34b509a6c7467ac70 (patch) | |
| tree | a8a3c8b9775dbdb83b5d3e673983a99b0b0c8487 | |
| parent | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' (diff) | |
| parent | show-branch: line-wrap show-branch usage (diff) | |
| download | tgif-d62078e9107f01c902c260e34b509a6c7467ac70.tar.xz | |
Merge branch 'ak/show-branch-usage-string'
* ak/show-branch-usage-string:
show-branch: line-wrap show-branch usage
| -rw-r--r-- | builtin/show-branch.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 270e39c6c1..691eeda345 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -6,7 +6,10 @@ #include "parse-options.h" static const char* show_branch_usage[] = { - N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"), + N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" + " [--current] [--color[=<when>] | --no-color] [--sparse]\n" + " [--more=<n> | --list | --independent | --merge-base]\n" + " [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"), N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"), NULL }; |