X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=bdcea0ed703057e08fd4204245f4f0c8a308f8d0;hb=7ee906694c28ab7281492d5114d2afabd964bd41;hp=df5fd65d56bde3ed046c9ed40e62e8a17ede2e8e;hpb=f81117b84d2c99a29acf06c6522aad54defbc760;p=git.git

diff --git a/git-rebase.sh b/git-rebase.sh
index df5fd65d5..bdcea0ed7 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -61,7 +61,7 @@ continue_merge () {
 	fi
 
 	cmt=`cat "$dotest/current"`
-	if ! git diff-index --quiet HEAD
+	if ! git diff-index --quiet HEAD --
 	then
 		if ! git-commit -C "$cmt"
 		then
@@ -179,6 +179,7 @@ do
 		exit
 		;;
 	--skip)
+		git reset --hard HEAD || exit $?
 		if test -d "$dotest"
 		then
 			git rerere clear
@@ -284,7 +285,7 @@ fi
 
 # The tree must be really really clean.
 git update-index --refresh || exit
-diff=$(git diff-index --cached --name-status -r HEAD)
+diff=$(git diff-index --cached --name-status -r HEAD --)
 case "$diff" in
 ?*)	echo "cannot rebase: your index is not up-to-date"
 	echo "$diff"