X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-am.sh;h=872145b92dc7000eb1c87d548a46fa0d9522870d;hb=83262ec139e5012e20fddb30aabcd8d7c9f64e34;hp=ab133fbd51308da26665abf34d169d9c1044c0d4;hpb=1114b68f25d1d0a0a0a54406ab0cb3e154bdbad9;p=git.git

diff --git a/git-am.sh b/git-am.sh
index ab133fbd..872145b9 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -2,7 +2,8 @@
 #
 # Copyright (c) 2005, 2006 Junio C Hamano
 
-USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
+USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+  [--interactive] [--whitespace=<option>] <mbox>...
   or, when resuming [--skip | --resolved]'
 . git-sh-setup
 
@@ -375,6 +376,13 @@ do
 			echo "No changes - did you forget update-index?"
 			stop_here $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?"
+			stop_here $this
+		fi
 		apply_status=0
 		;;
 	esac