git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b660a76 fbae70d)
Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'
authorJunio C Hamano <redacted>
Wed, 22 Apr 2020 20:42:47 +0000 (13:42 -0700)
committerJunio C Hamano <redacted>
Wed, 22 Apr 2020 20:42:47 +0000 (13:42 -0700)
commitdfdce31ce6c9c4d7266031ea70f982e7f22bb525
tree451a384d7d70ceaf0cf70f95f900d859de56826ftree | snapshot
parentb660a76d0f0f6b7bbf7e7d0b619edf0decc9d22ecommit | diff
parentfbae70ddc6da7df3f901d95da2b11b2cb58c8a29commit | diff
Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'

"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
builtin/pull.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT