projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix trivial typo in git-log man page.
[git.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index
ab133fb
..
872145b
100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-2,7
+2,8
@@
#
# Copyright (c) 2005, 2006 Junio C Hamano
#
# 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
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
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
apply_status=0
;;
esac