diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:42 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-12-01 01:49:42 +0300 |
commit | 290c94085bc913951d15c47bce818a19541a1e72 (patch) | |
tree | 2346e36148c3ffd3959aecd03aa813a582e76f3d /builtin/pull.c | |
parent | 376b4cc420182a72c46da6a12f53157cadd81bd5 (diff) | |
parent | e01ae2a4a7e99357b9464b54e48cbf4b4caac036 (diff) |
Merge branch 'js/pull-rebase-use-advise'
UI improvement.
* js/pull-rebase-use-advise:
pull: colorize the hint about setting `pull.rebase`
Diffstat (limited to 'builtin/pull.c')
-rw-r--r-- | builtin/pull.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 17aa63cd35..1034372f8b 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -345,18 +345,18 @@ static enum rebase_type config_get_rebase(void) return parse_config_rebase("pull.rebase", value, 1); if (opt_verbosity >= 0 && !opt_ff) { - warning(_("Pulling without specifying how to reconcile divergent branches is\n" - "discouraged. You can squelch this message by running one of the following\n" - "commands sometime before your next pull:\n" - "\n" - " git config pull.rebase false # merge (the default strategy)\n" - " git config pull.rebase true # rebase\n" - " git config pull.ff only # fast-forward only\n" - "\n" - "You can replace \"git config\" with \"git config --global\" to set a default\n" - "preference for all repositories. You can also pass --rebase, --no-rebase,\n" - "or --ff-only on the command line to override the configured default per\n" - "invocation.\n")); + advise(_("Pulling without specifying how to reconcile divergent branches is\n" + "discouraged. You can squelch this message by running one of the following\n" + "commands sometime before your next pull:\n" + "\n" + " git config pull.rebase false # merge (the default strategy)\n" + " git config pull.rebase true # rebase\n" + " git config pull.ff only # fast-forward only\n" + "\n" + "You can replace \"git config\" with \"git config --global\" to set a default\n" + "preference for all repositories. You can also pass --rebase, --no-rebase,\n" + "or --ff-only on the command line to override the configured default per\n" + "invocation.\n")); } return REBASE_FALSE; |