]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e4dc25e) | patch
pull: make --rebase and --no-rebase override pull.ff=only
authorElijah Newren <newren@gmail.com>
Thu, 22 Jul 2021 05:04:47 +0000 (05:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jul 2021 18:54:29 +0000 (11:54 -0700)
commitadc27d6a9374d012b091bc348c20f5bfdbee52d1
treeab53d1e016d9d40cb68ff97227c446addb670044tree
parente4dc25ed49d94c93b1d3f63efe17f32ca682cab7commit | diff
pull: make --rebase and --no-rebase override pull.ff=only

Fix the last few precedence tests failing in t7601 by now implementing
the logic to have --[no-]rebase override a pull.ff=only config setting.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c diff | blob | blame | history
t/t7601-merge-pull-config.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.