octopus: reenable fast-forward merges
authorStephen Boyd <bebarino@gmail.com>
Sat, 12 Dec 2009 00:38:58 +0000 (16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Dec 2009 07:40:24 +0000 (23:40 -0800)
commit85bf49f...a55fd9ded396460d245a55b651d7bdaa
treef7927bd...30d780307a963ddf63a71f5543ebe09ecopy hash to clipboard (tree)
parent8133450...eed1c78f49fc74936b712b3cf32b682acopy hash to clipboard (diff)
git-merge-octopus.sh
t/t7602-merge-octopus-many.sh