diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-31 02:06:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-31 02:06:01 +0300 |
| commit | 7d0daf3f12f87799a3b3f524933ef6c15d1f28c3 (patch) | |
| tree | eca75e171dba696509e72c6bdb2cc31fdce65529 /t/t4013-diff-various.sh | |
| parent | c4203212e360b25a1c69467b5a8437d45a373cac (diff) | |
| parent | 6f843a3355ee590dfe09eb90679051e75fadf675 (diff) | |
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 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index e561a8e485..28683d059d 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -65,7 +65,7 @@ test_expect_success setup ' export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && git checkout master && - git pull -s ours . side && + git pull -s ours --no-rebase . side && GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" && GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" && |