diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/git-pull.sh b/git-pull.sh index 8eb74d45de..20a3bbea07 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -201,10 +201,7 @@ test true = "$rebase" && { die "updating an unborn branch with changes added to the index" fi else - git update-index --ignore-submodules --refresh && - git diff-files --ignore-submodules --quiet && - git diff-index --ignore-submodules --cached --quiet HEAD -- || - die "refusing to pull with rebase: your working tree is not up-to-date" + require_clean_work_tree "pull with rebase" "Please commit or stash them." fi oldremoteref= && . git-parse-remote && |