Avery Pennarun <apenwarr@xxxxxxxxx> writes:
> (Patch originally by Junio Hamano <gitster@xxxxxxxxx>.)
>
> Signed-off-by: Avery Pennarun <apenwarr@xxxxxxxxx>
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.
--
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