From aa2008456aa4f2add4567843faea7cadb3a172aa Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 9 Jun 2013 14:24:48 -0500 Subject: [PATCH] rebase: cherry-pick: add merge options Signed-off-by: Felipe Contreras --- git-rebase--cherrypick.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index 99e29dd479..dcdfc68cac 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase--cherrypick.sh @@ -43,6 +43,15 @@ 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 cherry-pick --no-merges --right-only --topo-order --do-walk --action-name rebase $extra "$revisions" ret=$? -- 2.32.0.93.g670b81a890