On Tue, 2008-12-09 at 11:31 +0100, Lars Hjemli wrote: > On Tue, Dec 9, 2008 at 11:12, R. Tyler Ballance <tyler@xxxxxxxxx> wrote: > > 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. > > $ git config alias.xpull "pull --no-ff" ? Interesting, I might have to try that out (wasn't aware of `git config alias.<alias>`) > > But are you sure you never want a fast-forward on _any_ branch? I use > --no-ff unconditionally on the master and stable branches as $dayjob, > to make sure that the merging of feature/bugfix-branches are > explicitly noted in history, but I almost never use it on other > branches. I understand this, it's a funny situation. When we were evaluating Git my team *never* had these issues because we all kept our trees in good condition such that we never accidentally merged down to a stable branch, but we also almost always generated merge commits because of the variety of changes that would be going into stable at any given time. I agree that I wouldn't want/need to use it on WIP branches or purely local branches for development, so if I were able to restrict --no-ff to only be forced on tracked branches I would be happy enough :) Really hate to take this much bandwidth up on the mailing list over such a silly problem, but after spending a week trying to /talk/ and educate some folks, I feel drastic measures need to be taken ;) Cheers -- -R. Tyler Ballance Slide, Inc.
Attachment:
signature.asc
Description: This is a digitally signed message part
