[PATCH v6 26/28] rebase: cherry-pick: add merge options
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:58:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- git-rebase--cherrypick.sh | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index d36b0dc..bda7cfc 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase--cherrypick.sh@@ -45,6 +45,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=$?
--
1.8.4-fc