Re: [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 23, 2007, 00:51 UTC
Message-ID: <7vps0adx0x.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1190421186-21784-4-git-send-email-hjemli@gmail.com>

Lars Hjemli <hjemli@gmail.com> writes:

Show 12 quoted lines

> 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?