]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 225bc32) | patch
t5520: do not use `pull.rebase=preserve`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Tue, 7 Sep 2021 21:05:02 +0000 (21:05 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2021 04:45:32 +0000 (21:45 -0700)
commit6df8755c7b953665bb1960e660fceb5acc2b2a23
treede1d27a9ad1ce4a0f86dcf32fad841dc2e98ad88tree | snapshot
parent225bc32a989d7a22fa6addafd4ce7dcd04675dbfcommit | diff
t5520: do not use `pull.rebase=preserve`

Even if those tests try to override that setting, let's not use it
because it is deprecated: let's use `merges` instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5520-pull.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.