git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 17 Jan 2017 23:11:04 +0000 (15:11 -0800)
committer	Junio C Hamano <redacted>
	Tue, 17 Jan 2017 23:11:05 +0000 (15:11 -0800)
commit	e4ec4089883c9076744561863f9913bdefec06cf
tree	0da60edb46ca721baef5a128e3450cb6466d5f53	tree \| snapshot
parent	07ec05d9e6f54874c6a439fea35ec70ffa05c1a0	commit \| diff
parent	33b842a1e9bf28bcffe953ad9dcdbb0561336314	commit \| diff

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"

builtin/pull.c	diff1 \|	diff2 \|	blob \| history
t/t5520-pull.sh	diff1 \|	diff2 \|	blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT

builtin/pull.c	diff1 \|	diff2 \|	blob \| history
t/t5520-pull.sh	diff1 \|	diff2 \|	blob \| history