Merge branch 'jk/am-skip-hint'

gitster · gitster · commit af2fc76b4a20 · 2010-06-18T11:16:56.000-07:00
* jk/am-skip-hint:
  git-am: suggest what to do with superfluous patches
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)

Original file line number	Diff line number	Diff line change
`@@ -726,6 +726,8 @@ do`
`726`	`726`	`resolved=`
`727`	`727`	`git diff-index --quiet --cached HEAD -- && {`
`728`	`728`	`echo "No changes - did you forget to use 'git add'?"`
	`729`	`+ echo "If there is nothing left to stage, chances are that something else"`
	`730`	`+ echo "already introduced the same changes; you might want to skip this patch."`
`729`	`731`	`stop_here_user_resolve $this`
`730`	`732`	`}`
`731`	`733`	`unmerged=$(git ls-files -u)`