Re: [PATCH 5/8] Teach git-pull to pass -X<option> to git-merge
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:46
Avery Pennarun [off-list ref] writes:
(Patch originally by Junio Hamano [off-list ref].) Signed-off-by: Avery Pennarun <redacted>
You should take the full authorship of this patch without even mentioning "originally by". It has no code from me.
quoted hunk ↗ jump to hunk
@@ -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.