X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=0e9d52a5007ed12a23d52a157a7118a50b7693f8;hb=f04aa35eb6117d99f5abf9630961b2c2651d3ed1;hp=10a238ae3cc942bc021db18195b7098e2866c266;hpb=6a2e93f1074d5a8b25c2020805e6b8d795d13e4d;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 10a238ae3..0e9d52a50 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -412,19 +412,7 @@ else fi fi -# The tree must be really really clean. -if ! git update-index --ignore-submodules --refresh > /dev/null; then - echo >&2 "cannot rebase: you have unstaged changes" - git diff-files --name-status -r --ignore-submodules -- >&2 - exit 1 -fi -diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --) -case "$diff" in -?*) echo >&2 "cannot rebase: your index contains uncommitted changes" - echo >&2 "$diff" - exit 1 - ;; -esac +require_clean_work_tree "rebase" "Please commit or stash them." if test -z "$rebase_root" then