Junio C Hamano <gitster@xxxxxxxxx> writes: > Looks good; thanks both. I spoke too fast. You would need something like this on top to avoid confusing certain implementations of "expr" (e.g. FreeBSD 8.0). git-rebase.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index b1743ea..7d1c5c3 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -302,9 +302,9 @@ do newopt="$2" shift ;; *,--strategy-option=*) - newopt="$(expr "$1" : '--strategy-option=\(.*\)')" ;; + newopt="$(expr " $1" : ' --strategy-option=\(.*\)')" ;; *,-X*) - newopt="$(expr "$1" : '-X\(.*\)')" ;; + newopt="$(expr " $1" : ' -X\(.*\)')" ;; 1,*) usage ;; esac -- 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