Merge branch 'jk/am-skip-hint'

* jk/am-skip-hint: git-am: suggest what to do with superfluous patches
git-mirror · Jun 18, 2010 · af2fc76 · af2fc76
2 parents 18fd805 + 05bdcfe
commit af2fc76
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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)