projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5210ab9 33b842a)
Merge branch 'jc/pull-rebase-ff' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:07 +0000 (15:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:33:07 +0000 (15:33 -0800)
commitc1a0cedd9e917cbfa52212231ef231b3112e308f
tree4b468bb03e33570311684c7e91db87463302dc03tree | snapshot
parent5210ab9973e294204e7a322ba9a9e8faed9b8c1bcommit | diff
parent33b842a1e9bf28bcffe953ad9dcdbb0561336314commit | diff
Merge branch 'jc/pull-rebase-ff' into next

"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 | blob | history
t/t5520-pull.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.