> > $ 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 had done something like this with a post-checkout hook. After checking out any branch, the hook sets various branch.<name>.options. Also, I wrote a hook to enforce "only no-ff commits can move stable" and other fun stuff. It's out on github, in a semi-documented/unannounced project with the email/trac/etc. hooks we put in place: http://github.com/stephenh/gc/tree/master/server/update-stable - Stephen -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
