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)
commit2fb11ec...c175e8a380d91daccc3bbf9fc5bbea8b
tree1f6c6ed...942f20d97705b9e3e4dd603d122fafa8copy hash to clipboard (tree)
parent101f3dc...2a4cedb1f359f6ddce913b631ffa75b6copy hash to clipboard (diff)
parent33b842a...e9bf28bcffe953ad9dcdbb0561336314copy hash to clipboard (diff)
builtin/pull.c
t/t5520-pull.sh