diff options
-rwxr-xr-x | git-am.sh | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -726,6 +726,8 @@ do resolved= git diff-index --quiet --cached HEAD -- && { echo "No changes - did you forget to use 'git add'?" + echo "If there is nothing left to stage, chances are that something else" + echo "already introduced the same changes; you might want to skip this patch." stop_here_user_resolve $this } unmerged=$(git ls-files -u) |