Merge branch 'js/pull-rebase-type-shorthand'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:59 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:59 +0000 (13:09 -0700)
commitc757aa2...12ceeb5a86c2da8ad1e9e752625af739
tree9adebc7...9fe47fde483eb4d1734c83dc355ccdc7copy hash to clipboard (tree)
parentf74e7b8...5b1d5d7a70cfd3a747ee7242060092e9copy hash to clipboard (diff)
parent46af44b...7dd433c073778f0d5ab27d0167dbcec4copy hash to clipboard (diff)
builtin/pull.c
t/t5520-pull.sh