summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2020-03-10 03:54:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-10 20:06:41 (GMT)
commitd18c950a69f3a24e1e3add3d9fc427641f53e12b (patch)
treecbaf69e10bf4d7397748baa56d47bc7e3e5844f8 /builtin
parent2d2118b814c11f509e1aa76cb07110f7231668dc (diff)
downloadgit-d18c950a69f3a24e1e3add3d9fc427641f53e12b.zip
git-d18c950a69f3a24e1e3add3d9fc427641f53e12b.tar.gz
git-d18c950a69f3a24e1e3add3d9fc427641f53e12b.tar.bz2
pull: warn if the user didn't say whether to rebase or to merge
Often novice Git users forget to say "pull --rebase" and end up with an unnecessary merge from upstream. What they usually want is either "pull --rebase" in the simpler cases, or "pull --ff-only" to update the copy of main integration branches, and rebase their work separately. The pull.rebase configuration variable exists to help them in the simpler cases, but there is no mechanism to make these users aware of it. Issue a warning message when no --[no-]rebase option from the command line and no pull.rebase configuration variable is given. This will inconvenience those who never want to "pull --rebase", who haven't had to do anything special, but the cost of the inconvenience is paid only once per user, which should be a reasonable cost to help a number of new users. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/pull.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 3e624d1..e42665b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -327,6 +327,22 @@ static enum rebase_type config_get_rebase(void)
if (!git_config_get_value("pull.rebase", &value))
return parse_config_rebase("pull.rebase", value, 1);
+ if (opt_verbosity >= 0 &&
+ (!opt_ff || strcmp(opt_ff, "--ff-only"))) {
+ 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"));
+ }
+
return REBASE_FALSE;
}