Elijah Newren 031e2f7ae1 pull: abort by default when fast-forwarding is not possible ...

We have for some time shown a long warning when the user does not
specify how to reconcile divergent branches with git pull.  Make it an
error now.

Initial-patch-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2021-07-22 11:54:29 -07:00

9.1 KiB

Executable File

Raw Blame History

View Raw