]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b660a76 fbae70d)
Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:47 +0000 (13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:47 +0000 (13:42 -0700)
"git pull --rebase" tried to run a rebase even after noticing that
the pull results in a fast-forward and no rebase is needed nor
sensible, for the past few years due to a mistake nobody noticed.

* en/pull-do-not-rebase-after-fast-forwarding:
  pull: avoid running both merge and rebase

1  2 
builtin/pull.c patch | diff1 | diff2 | blob | history

diff --cc builtin/pull.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.