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

diff --git a/builtin/pull.c b/builtin/pull.c
index 7e3c11ea6351c9703fe7d50057392f0548e03160..a39bb0a11f72982f51222cdcf19d1010367c908f 100644 (file)
--- 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 cccca991046a6f4b6cf967a99a7f7a4396d4d588..cba0e2266623d57fe96fcec1910c562bf424d143 100644 (file)
--- 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 04dd00f734166acc9c0670de061c4612877a7187..7f30d3a76f69e58ae3cdbbe05c5ebdce6c8a120d 100644 (file)
--- 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(),
        };