add .mailmap for git-shortlog output with the git repository

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index 5df6787a3f285f18d3a41c1ab2f0579f407e02de..0126a77b924e7f1fe7f3913b84350ab35e6e043a 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -401,14 +401,14 @@ do
                changed="$(git-diff-index --cached --name-only HEAD)"
                if test '' = "$changed"
                then
-                       echo "No changes - did you forget update-index?"
+                       echo "No changes - did you forget to use 'git add'?"
                        stop_here_user_resolve $this
                fi
                unmerged=$(git-ls-files -u)
                if test -n "$unmerged"
                then
                        echo "You still have unmerged paths in your index"
-                       echo "did you forget update-index?"
+                       echo "did you forget to use 'git add'?"
                        stop_here_user_resolve $this
                fi
                apply_status=0