From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 09 Dec 2008 09:46:05 GMT
Subject: Re: Forcing --no-ff on pull
Message-ID: <m3vdtthebu.fsf@localhost.localdomain>
In-Reply-To: <1228815240.18611.48.camel@starfruit.local>

"R. Tyler Ballance" <tyler@slide.com> writes:

> Is there a header macro I can define or a config option I could define
> to make --no-ff on `git pull` implicit instead of explicit? Making sure
> we are always generating merge commits as a "just-in-case" safe guard
> about merge-happy developers who think after hitting enter? :)

branch.<name>.mergeoptions ?
-- 
Jakub Narebski
Poland
ShadeHawk on #git