diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-17 14:39:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-17 14:39:19 -0700 |
| commit | d914e11def123685547e36ef233620b04c667b23 (patch) | |
| tree | 738544153fe2e2e4372dcd5d108fdbbd020739d2 /builtin | |
| parent | 6deae6983ccf4e2be236500edc728f5427ef0eca (diff) | |
| parent | 4bef181256a43e3fae0ee7d34a5279a6302188a8 (diff) | |
| download | git-d914e11def123685547e36ef233620b04c667b23.tar.gz | |
Merge branch 'tk/pull-conflict-suggest-rebase-merge-not-rebase-true' into seen
In an advice message after failed non-ff pull, we used to suggest
setting pull.rebase=true, but these days pull.rebase=merges may be
more inline with the original spirit of "rebuild your side on top
of theirs".
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true:
pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index b9e5c64ee8..7279b2a780 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -967,13 +967,13 @@ static void show_advice_pull_non_ff(void) "your next pull:\n" "\n" " git config pull.rebase false # merge\n" - " git config pull.rebase true # rebase\n" + " git config pull.rebase merges # 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")); + "preference for all repositories. You can also pass --rebase=merges,\n" + "--no-rebase, or --ff-only on the command line to override the configured\n" + "default per invocation.\n")); } int cmd_pull(int argc, const char **argv, const char *prefix) |