Merge branch 'ah/usage-strings'

* ah/usage-strings:
  standardize usage info string format
This commit is contained in:
Junio C Hamano
2015-02-11 13:44:19 -08:00
64 changed files with 108 additions and 104 deletions

View File

@ -6,11 +6,11 @@
#include "parse-options.h"
static const char* show_branch_usage[] = {
N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
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>]"),
N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"),
NULL
};