summaryrefslogtreecommitdiff
path: root/builtin/show-branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-14 20:37:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-14 20:37:07 (GMT)
commitd62078e9107f01c902c260e34b509a6c7467ac70 (patch)
treea8a3c8b9775dbdb83b5d3e673983a99b0b0c8487 /builtin/show-branch.c
parent601ca9287d9ba5c34494cac3b99b25c77a5d8674 (diff)
parent99902739174be82851143d4be2a0f85727a9efe0 (diff)
downloadgit-d62078e9107f01c902c260e34b509a6c7467ac70.zip
git-d62078e9107f01c902c260e34b509a6c7467ac70.tar.gz
git-d62078e9107f01c902c260e34b509a6c7467ac70.tar.bz2
Merge branch 'ak/show-branch-usage-string'
* ak/show-branch-usage-string: show-branch: line-wrap show-branch usage
Diffstat (limited to 'builtin/show-branch.c')
-rw-r--r--builtin/show-branch.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 270e39c..691eeda 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
};