]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 101f3dc 33b842a)
Merge branch 'jc/pull-rebase-ff'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:38 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:38 +0000 (14:45 -0800)
commit2fb11ec6c175e8a380d91daccc3bbf9fc5bbea8b
tree1f6c6ed0942f20d97705b9e3e4dd603d122fafa8tree | snapshot
parent101f3dc92a4cedb1f359f6ddce913b631ffa75b6commit | diff
parent33b842a1e9bf28bcffe953ad9dcdbb0561336314commit | 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"
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.