From: Felipe Contreras Date: Sun, 09 Jun 2013 19:24:48 GMT Subject: [PATCH v5 34/36] rebase: cherry-pick: add merge options Message-ID: <1370805890-3453-35-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1370805890-3453-1-git-send-email-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index 6f63618..644d45e 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase--cherrypick.sh @@ -48,6 +48,14 @@ else fi test -n "$GIT_QUIET" && extra="$extra -q" test -z "$force_rebase" && extra="$extra --ff" +test -n "$strategy" && extra="$extra --strategy=$strategy" +for x in "$strategy_opts" +do + test -z "$x" && continue + x=$(eval "echo $x") + extra="$extra -X${x#--}" +done +test -n "$allow_rerere_autoupdate" && extra="$extra $allow_rerere_autoupdate" git rev-list $rev_args > "$state_dir"/list git cherry-pick --action-name rebase $extra $rev_args -- 1.8.3.698.g079b096