From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Nov 2009 06:16:31 GMT
Subject: Re: [PATCH 5/8] Teach git-pull to pass -X<option> to git-merge
Message-ID: <7vd435erpc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1ff0b2f7e3fae4cc6c7610c92711f33df9a3d07c.1259201377.git.apenwarr@gmail.com>

Avery Pennarun <apenwarr@gmail.com> writes:

> (Patch originally by Junio Hamano <gitster@pobox.com>.)
>
> Signed-off-by: Avery Pennarun <apenwarr@gmail.com>

You should take the full authorship of this patch without even mentioning
"originally by".  It has no code from me.

> @@ -216,7 +229,7 @@ fi
>  
>  merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
>  test true = "$rebase" &&
> -	exec git-rebase $diffstat $strategy_args --onto $merge_head \
> +	exec git-rebase $diffstat $strategy_args $merge_args --onto $merge_head \
>  	${oldremoteref:-$merge_head}
> -exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
> +exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args $merge_args \
>  	"$merge_name" HEAD $merge_head $verbosity

This part needs the usual "sq-then-eval" trick; -X subtree="My Programs"
on the command line will be split by the shell if you didn't do so.