From: Florian Weimer <fweimer@bfk.de>
Date: Fri, 24 Jul 2009 09:50:47 GMT
Subject: Fast-forward-only merge
Message-ID: <82ws5y4dfs.fsf@mid.bfk.de>

Is there an easy way to require that "git merge" succeeds only if the
merge is fast-forward?

-- 
Florian Weimer                <fweimer@bfk.de>
BFK edv-consulting GmbH       http://www.bfk.de/
Kriegsstraße 100              tel: +49-721-96201-1
D-76133 Karlsruhe             fax: +49-721-96201-99