From: Lars Hjemli <lh@elementstorage.no>
Date: Tue, 09 Dec 2008 09:49:54 GMT
Subject: Re: Forcing --no-ff on pull
Message-ID: <8c5c35580812090149lc6dd79cj60a9d23c18089557@mail.gmail.com>
In-Reply-To: <1228815240.18611.48.camel@starfruit.local>

On Tue, Dec 9, 2008 at 10:34, R. Tyler Ballance <tyler@slide.com> wrote:
> 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?

Try this:
$ git config branch.stable.mergeoptions "--no-ff"

--
lh