Merge branch 'ak/show-branch-usage-string'

* ak/show-branch-usage-string:
  show-branch: line-wrap show-branch usage
This commit is contained in:
Junio C Hamano 2015-01-14 12:37:07 -08:00
Родитель 601ca9287d 9990273917
Коммит d62078e910
1 изменённых файлов: 4 добавлений и 1 удалений

Просмотреть файл

@ -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
};