diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-14 21:59:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-14 21:59:04 (GMT) |
| commit | 153ec926b6ec4ac41f7fdfbca705a3afaa7ef192 (patch) | |
| tree | 683edb0a08ac232716c08b5a5dc98b52325369cd /builtin | |
| parent | 45733fa93f287fbc04d6a6a3f5a39cc852c5cf50 (diff) | |
| parent | 98c32bd88911388fac463bcaaf2daf85cbf2b151 (diff) | |
| download | git-153ec926b6ec4ac41f7fdfbca705a3afaa7ef192.zip git-153ec926b6ec4ac41f7fdfbca705a3afaa7ef192.tar.gz git-153ec926b6ec4ac41f7fdfbca705a3afaa7ef192.tar.bz2 | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 2 | ||||
| -rw-r--r-- | builtin/tag.c | 2 | ||||
| -rw-r--r-- | builtin/update-ref.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 7e3c11e..a39bb0a 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -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, diff --git a/builtin/tag.c b/builtin/tag.c index cccca99..cba0e22 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -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")), diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 04dd00f..7f30d3a 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -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(), }; |