summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Alex Henrie <alexhenrie24@gmail.com>2020-03-09 21:54:20 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-10 13:06:41 -0700
commitd18c950a69f3a24e1e3add3d9fc427641f53e12b (patch)
treecbaf69e10bf4d7397748baa56d47bc7e3e5844f8 /t/t3310-notes-merge-manual-resolve.sh
parentThe seventh batch for 2.26 (diff)
downloadtgif-d18c950a69f3a24e1e3add3d9fc427641f53e12b.tar.xz
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 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions