| commit | 031e2f7ae195069d00d21cde906fce5b0318dbdd | |
| author | Elijah Newren <newren@gmail.com> | |
| Thu, 22 Jul 2021 05:04:48 +0000 (22 05:04 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 22 Jul 2021 18:54:29 +0000 (22 11:54 -0700) | ||
| tree | 61c6b5cb09f65ab91fe17c72c7cdfc5d8213c5f0 | treesnapshot (tar.gz zip) |
| parent | adc27d6a9374d012b091bc348c20f5bfdbee52d1 | commitdiff |
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>
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>
13 files changed: