git/builtin
Junio C Hamano dfdce31ce6 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
2020-04-22 13:42:47 -07:00
..
2020-02-14 12:54:19 -08:00
2019-11-11 11:46:29 +09:00
2020-03-10 11:41:40 -07:00
2020-03-26 17:11:20 -07:00
2019-04-25 16:41:12 +09:00
2019-09-30 13:19:32 +09:00
2019-05-13 14:22:54 +09:00
2020-02-10 09:04:45 -08:00
2020-03-26 17:11:20 -07:00
2019-11-10 18:02:14 +09:00
2020-03-05 10:43:02 -08:00
2019-06-19 08:19:21 -07:00
2020-03-10 11:41:40 -07:00