Lars Hjemli <hjemli@xxxxxxxxx> writes: > diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt > index 144bc16..b1771a1 100644 > --- a/Documentation/git-merge.txt > +++ b/Documentation/git-merge.txt > @@ -58,6 +58,10 @@ merge.verbosity:: > above outputs debugging information. The default is level 2. > Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. > > +branch.<name>.mergeoptions:: > + Sets default options for merging into branch <name>. The syntax and > + supported options are equal to that of git-merge, but option values > + containing whitespace characters are currently not supported. I think this is a sensible thing to do in general. > +branch=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||') > +mergeopts=$(git config "branch.$branch.mergeoptions") > +parse_config $mergeopts What should happen when your head is detached? - 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
