diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-06-29 10:22:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 14:40:16 -0800 |
| commit | 33b842a1e9bf28bcffe953ad9dcdbb0561336314 (patch) | |
| tree | a0cac789037bd45e18d7a875918f7692af88b211 /t/t3420-rebase-autostash.sh | |
| parent | Git 2.6.6 (diff) | |
| download | tgif-33b842a1e9bf28bcffe953ad9dcdbb0561336314.tar.xz | |
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>
Diffstat (limited to 't/t3420-rebase-autostash.sh')
0 files changed, 0 insertions, 0 deletions