git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e465796)
pull: fast-forward "pull --rebase=true"
authorJunio C Hamano <redacted>
Wed, 29 Jun 2016 17:22:31 +0000 (10:22 -0700)
committerJunio C Hamano <redacted>
Tue, 29 Nov 2016 22:40:16 +0000 (14:40 -0800)
commit33b842a1e9bf28bcffe953ad9dcdbb0561336314
treea0cac789037bd45e18d7a875918f7692af88b211tree | snapshot
parente46579643d56162299b1756b70d418005351b256commit | diff
pull: fast-forward "pull --rebase=true"

"git pull --rebase" always runs "git rebase" after fetching the
commit to serve as the new base, even when the new base is a
descendant of the current HEAD, i.e. we haven't done any work.

In such a case, we can instead fast-forward to the new base without
invoking the rebase process.

Signed-off-by: Junio C Hamano <redacted>
builtin/pull.c diff | blob | history
t/t5520-pull.sh diff | blob | history
git clone https://git.99rst.org/PROJECT