diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-20 01:45:38 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-20 01:45:38 +0300 |
| commit | 2fb11ec6c175e8a380d91daccc3bbf9fc5bbea8b (patch) | |
| tree | 1f6c6ed0942f20d97705b9e3e4dd603d122fafa8 /t/t3600-rm.sh | |
| parent | 101f3dc92a4cedb1f359f6ddce913b631ffa75b6 (diff) | |
| parent | 33b842a1e9bf28bcffe953ad9dcdbb0561336314 (diff) | |
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"
Diffstat (limited to 't/t3600-rm.sh')
0 files changed, 0 insertions, 0 deletions