Merge branch 'jc/pull-rebase-ff' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:04 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:11:05 +0000 (15:11 -0800)
commite4ec408...883c9076744561863f9913bdefec06cf
tree0da60ed...46ca721baef5a128e3450cb6466d5f53copy hash to clipboard (tree)
parent07ec05d...e6f54874c6a439fea35ec70ffa05c1a0copy hash to clipboard (diff)
parent33b842a...e9bf28bcffe953ad9dcdbb0561336314copy hash to clipboard (diff)
builtin/pull.c
t/t5520-pull.sh