X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=git-rebase.sh;h=6ec155cf03c98f2e075f298039037d0e099311b1;hb=d52dc4b10b2f78dc24ea05e88ddc25ee0f46491e;hp=2315d95a9fb28e15190461a94a43e28e57fbe6c3;hpb=31f0bce8537a38639385366f05ba43e91bd91e38;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 2315d95a9..6ec155cf0 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -387,7 +387,7 @@ 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 --name-status -r --ignore-submodules -- >&2 + git diff-files --name-status -r --ignore-submodules -- >&2 exit 1 fi diff=$(git diff-index --cached --name-status -r --ignore-submodules HEAD --)