diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:05 -0800 |
| commit | e4ec4089883c9076744561863f9913bdefec06cf (patch) | |
| tree | 0da60edb46ca721baef5a128e3450cb6466d5f53 /merge-blobs.c | |
| parent | 07ec05d9e6f54874c6a439fea35ec70ffa05c1a0 (diff) | |
| parent | 33b842a1e9bf28bcffe953ad9dcdbb0561336314 (diff) | |
| download | git-e4ec4089883c9076744561863f9913bdefec06cf.tar.gz | |
Merge branch 'jc/pull-rebase-ff' into maint
"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 'merge-blobs.c')
0 files changed, 0 insertions, 0 deletions