summaryrefslogtreecommitdiff
path: root/t/t2106-update-index-assume-unchanged.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:36 -0700
commitb20f67a65939a9c8f43354d70ab6000f615d1804 (patch)
treed248b20f74bc89f15670809a7f55a97f824679d5 /t/t2106-update-index-assume-unchanged.sh
parentMerge branch 'jt/push-negotiation-fixes' into maint (diff)
parentpull: fix handling of multiple heads (diff)
downloadtgif-b20f67a65939a9c8f43354d70ab6000f615d1804.tar.xz
Merge branch 'en/pull-conflicting-options' into maint
"git pull" had various corner cases that were not well thought out around its --rebase backend, e.g. "git pull --ff-only" did not stop but went ahead and rebased when the history on other side is not a descendant of our history. The series tries to fix them up. * en/pull-conflicting-options: pull: fix handling of multiple heads pull: update docs & code for option compatibility with rebasing pull: abort by default when fast-forwarding is not possible pull: make --rebase and --no-rebase override pull.ff=only pull: since --ff-only overrides, handle it first pull: abort if --ff-only is given and fast-forwarding is impossible t7601: add tests of interactions with multiple merge heads and config t7601: test interaction of merge/rebase/fast-forward flags and options
Diffstat (limited to 't/t2106-update-index-assume-unchanged.sh')
0 files changed, 0 insertions, 0 deletions