Merge branch 'jk/am-skip-hint'

* jk/am-skip-hint:
git-am: suggest what to do with superfluous patches

diff --git a/git-am.sh b/git-am.sh
index 87ffae252b3f2ff88646d142ea9c2dfb38a28953..43ea52c15c3031bd12e86df4016fb35efaf05e5d 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -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)