| commit | 33b842a1e9bf28bcffe953ad9dcdbb0561336314 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Jun 2016 17:22:31 +0000 (29 10:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Nov 2016 22:40:16 +0000 (29 14:40 -0800) | ||
| tree | a0cac789037bd45e18d7a875918f7692af88b211 | treesnapshot (tar.gz zip) |
| parent | e46579643d56162299b1756b70d418005351b256 | commitdiff |
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 <gitster@pobox.com>
"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 <gitster@pobox.com>
| builtin/pull.c | diffblobblamehistory | |
| t/t5520-pull.sh | diffblobblamehistory |