diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-14 14:59:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-14 14:59:04 -0700 |
| commit | 153ec926b6ec4ac41f7fdfbca705a3afaa7ef192 (patch) | |
| tree | 683edb0a08ac232716c08b5a5dc98b52325369cd /builtin/pull.c | |
| parent | 45733fa93f287fbc04d6a6a3f5a39cc852c5cf50 (diff) | |
| parent | 98c32bd88911388fac463bcaaf2daf85cbf2b151 (diff) | |
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/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 7e3c11ea63..a39bb0a11f 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, |