Merge branch 'tb/pull-ff-rebase-autostash'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:18:13 +0000 (09:18 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jun 2017 00:18:13 +0000 (09:18 +0900)
commit35898ea...ab5dfd4ebc9daf2f4e422a1d4771954b
tree78d6fc5...b2b26faa195ace41e7e771a9fe445bcecopy hash to clipboard (tree)
parent6e9b010...c6515510580da1698af893263f8cd7decopy hash to clipboard (diff)
parentf15e7cf...cc95cbfd0d05c260f75631781e290edccopy hash to clipboard (diff)
builtin/pull.c