mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'rt/help-strings-fix'
* rt/help-strings-fix: tag, update-ref: improve description of option "create-reflog" pull: don't mark values for option "rebase" for translation
This commit is contained in:
commit
153ec926b6
|
@ -112,7 +112,7 @@ static struct option pull_options[] = {
|
|||
/* Options passed to git-merge or git-rebase */
|
||||
OPT_GROUP(N_("Options related to merging")),
|
||||
{ OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
|
||||
N_("false|true|preserve"),
|
||||
"false|true|preserve",
|
||||
N_("incorporate changes by rebasing rather than merging"),
|
||||
PARSE_OPT_OPTARG, parse_opt_rebase },
|
||||
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
|
||||
|
|
|
@ -606,7 +606,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
|
|||
OPT_STRING('u', "local-user", &keyid, N_("key-id"),
|
||||
N_("use another key to sign the tag")),
|
||||
OPT__FORCE(&force, N_("replace the tag if exists")),
|
||||
OPT_BOOL(0, "create-reflog", &create_reflog, N_("create_reflog")),
|
||||
OPT_BOOL(0, "create-reflog", &create_reflog, N_("create a reflog")),
|
||||
|
||||
OPT_GROUP(N_("Tag listing options")),
|
||||
OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
|
||||
|
|
|
@ -365,7 +365,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
|||
N_("update <refname> not the one it points to")),
|
||||
OPT_BOOL('z', NULL, &end_null, N_("stdin has NUL-terminated arguments")),
|
||||
OPT_BOOL( 0 , "stdin", &read_stdin, N_("read updates from stdin")),
|
||||
OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create_reflog")),
|
||||
OPT_BOOL( 0 , "create-reflog", &create_reflog, N_("create a reflog")),
|
||||
OPT_END(),
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue