X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-rebase.sh;h=023a6dc94a48f7abf2801359ad68d40909e9b6aa;hb=6e13921b4f7adcc7316a76c0c4955b85b1589a65;hp=f2742aa054d2080a4a554ade3916c3bfa110af67;hpb=4f2d651e5b3414eac5d22ff47366d22c8cc289f6;p=git.git

diff --git a/git-rebase.sh b/git-rebase.sh
index f2742aa05..023a6dc94 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -139,10 +139,26 @@ finish_rb_merge () {
 }
 
 is_interactive () {
-	test -f "$dotest"/interactive ||
-	while :; do case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
+	while test $# != 0
+	do
+		case "$1" in
+			-i|--interactive)
+				interactive_rebase=explicit
+				break
+			;;
+			-p|--preserve-merges)
+				interactive_rebase=implied
+			;;
+		esac
 		shift
-	done && test -n "$1"
+	done
+
+	if [ "$interactive_rebase" = implied ]; then
+		GIT_EDITOR=:
+		export GIT_EDITOR
+	fi
+
+	test -n "$interactive_rebase" || test -f "$dotest"/interactive
 }
 
 run_pre_rebase_hook () {