On Tue, 2008-12-09 at 10:49 +0100, Lars Hjemli wrote: > On Tue, Dec 9, 2008 at 10:34, R. Tyler Ballance <tyler@xxxxxxxxx> 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" I recall stumbling across this a while ago looking at the git-config(1) man page, but this isn't /quite/ what we need. I'm talking about forcing for *every* pull, it's a safe assumption to make that we want a merge commit every time somebody fast-forwards a branch. The only way I could think to make use of branch.<name>.mergeoptions would be to automagically set it up in a "pre-merge" hook, but alas post-merge exists but not pre-merge. I could certainly patch to support a pre-merge, but that seems like the longest possible route to my desired destination ;) Cheers -- -R. Tyler Ballance Slide, Inc.
Attachment:
signature.asc
Description: This is a digitally signed message part
