pull: pass git-merge's options to git-merge
authorPaul Tan <pyokagan@gmail.com>
Sun, 14 Jun 2015 08:41:54 +0000 (16:41 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Jun 2015 19:40:50 +0000 (12:40 -0700)
commit11b6d17...0173727b5ecb82428cf49e5788b2985a
treed176f31...7488f231ea696b4450c9b3ea668055cbcopy hash to clipboard (tree)
parent2a74790...c3290efba0ba44c77cf2e5692d998af2copy hash to clipboard (diff)
builtin/pull.c