From: Martin von Zweigbergk Date: Tue, 09 Nov 2010 20:58:19 GMT Subject: [PATCH] rebase: allow -X for non-recursive strategy Message-ID: <1289336299-28282-1-git-send-email-martin.von.zweigbergk@gmail.com> If any strategy options are passed to -X, the strategy will always be set to 'recursive'. According to the documentation, it should default to 'recursive' if it is not set, but it should be possible to set it to other values. Signed-off-by: Martin von Zweigbergk --- Maybe I'm missing something, but it looks very much like that '-n' should have been a '-z'. But still, 'strategy' is set to 'recursive' at the start of the script and doesn't seem to be unset anywhere, so the block shouldn't be necessary at all. git-rebase.sh | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 42c0628..ec08f9c 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -312,10 +312,6 @@ do esac strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$newopt")" do_merge=t - if test -n "$strategy" - then - strategy=recursive - fi ;; -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ --strateg=*|--strategy=*|\ -- 1.7.3.2.167.ga361b