Merge branch 'rr/am-help'

diff --git a/git-am.sh b/git-am.sh
index d3f6a893527bcf4c14195763c1fc3e35d023e645..ef2d51a2b80d77dc5fe28d76b5047a97dc4c0fae 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -735,6 +735,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)