| commit | 2fb11ec6c175e8a380d91daccc3bbf9fc5bbea8b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Dec 2016 22:45:38 +0000 (19 14:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Dec 2016 22:45:38 +0000 (19 14:45 -0800) | ||
| tree | 1f6c6ed0942f20d97705b9e3e4dd603d122fafa8 | treesnapshot (tar.gz zip) |
| parent | 101f3dc92a4cedb1f359f6ddce913b631ffa75b6 | commitdiff |
| parent | 33b842a1e9bf28bcffe953ad9dcdbb0561336314 | commitdiff |
Merge branch 'jc/pull-rebase-ff'
"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.
* jc/pull-rebase-ff:
pull: fast-forward "pull --rebase=true"
"git pull --rebase", when there is no new commits on our side since
we forked from the upstream, should be able to fast-forward without
invoking "git rebase", but it didn't.
* jc/pull-rebase-ff:
pull: fast-forward "pull --rebase=true"
| builtin/pull.c | diff1 | diff2 | blobhistory |
| t/t5520-pull.sh | diff1 | diff2 | blobhistory |