1. Stefan Saasen
  2. git

Commits

David Kågedal  committed 6e598c3

Improved error message from git-rebase

If the index wasn't clean, git-rebase would simply show the output from
git-diff-index with no further comment to the user.

Signed-off-by: Junio C Hamano <junkio@cox.net>

  • Participants
  • Parent commits 9ebe6cf
  • Branches master

Comments (0)

Files changed (1)

File git-rebase.sh

View file
  • Ignore whitespace
 git-update-index --refresh || exit
 diff=$(git-diff-index --cached --name-status -r HEAD)
 case "$diff" in
-?*)	echo "$diff"
+?*)	echo "cannot rebase: your index is not up-to-date"
+	echo "$diff"
 	exit 1
 	;;
 esac