Skip to content

pull: conflict hint pull.rebase suggestion should offer "merges" vs "true" #1474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pull: conflict hint pull.rebase suggestion should offer "merges" vs "true" #1474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions builtin/pull.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down