diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 21:05:02 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-07 21:45:32 -0700 |
| commit | 6df8755c7b953665bb1960e660fceb5acc2b2a23 (patch) | |
| tree | de1d27a9ad1ce4a0f86dcf32fad841dc2e98ad88 /builtin/update-index.c | |
| parent | Git 2.33 (diff) | |
| download | tgif-6df8755c7b953665bb1960e660fceb5acc2b2a23.tar.xz | |
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>
Diffstat (limited to 'builtin/update-index.c')
0 files changed, 0 insertions, 0 deletions