]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: adc27d6) | patch
pull: abort by default when fast-forwarding is not possible
authorElijah Newren <newren@gmail.com>
Thu, 22 Jul 2021 05:04:48 +0000 (05:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jul 2021 18:54:29 +0000 (11:54 -0700)
commit031e2f7ae195069d00d21cde906fce5b0318dbdd
tree61c6b5cb09f65ab91fe17c72c7cdfc5d8213c5f0tree
parentadc27d6a9374d012b091bc348c20f5bfdbee52d1commit | diff
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>
13 files changed:
Documentation/git-pull.txt diff | blob | blame | history
builtin/pull.c diff | blob | blame | history
t/t4013-diff-various.sh diff | blob | blame | history
t/t5520-pull.sh diff | blob | blame | history
t/t5521-pull-options.sh diff | blob | blame | history
t/t5524-pull-msg.sh diff | blob | blame | history
t/t5553-set-upstream.sh diff | blob | blame | history
t/t5604-clone-reference.sh diff | blob | blame | history
t/t6402-merge-rename.sh diff | blob | blame | history
t/t6409-merge-subtree.sh diff | blob | blame | history
t/t6417-merge-ours-theirs.sh diff | blob | blame | history
t/t7601-merge-pull-config.sh diff | blob | blame | history
t/t7603-merge-reduce-heads.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.