diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-30 23:06:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 23:06:01 (GMT) |
| commit | 7d0daf3f12f87799a3b3f524933ef6c15d1f28c3 (patch) | |
| tree | eca75e171dba696509e72c6bdb2cc31fdce65529 /packfile.c | |
| parent | c4203212e360b25a1c69467b5a8437d45a373cac (diff) | |
| parent | 6f843a3355ee590dfe09eb90679051e75fadf675 (diff) | |
| download | git-7d0daf3f12f87799a3b3f524933ef6c15d1f28c3.zip git-7d0daf3f12f87799a3b3f524933ef6c15d1f28c3.tar.gz git-7d0daf3f12f87799a3b3f524933ef6c15d1f28c3.tar.bz2 | |
Merge branch 'en/pull-conflicting-options'
"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 'packfile.c')
0 files changed, 0 insertions, 0 deletions