Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-push: allow globbing wildcard refspec.
[gitweb.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index 99cedadda1da1ba2f62c22acfbd6477b1b2b38cb..9d2f71d15c47ae69eed57a7301d47c93d5bb070a 100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-249,7
+249,8
@@
fi
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