summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-21 21:30:17 -0500
committerJunio C Hamano <junkio@cox.net>2006-12-21 20:33:49 -0800
commit64646d11773774193093df96020d3fcb0df4a270 (patch)
treef05a139f4d1de6a9113341ad3d0d8222cf7ddee4 /git-am.sh
parentcaba139d432c420f853c352987cf29cefafc2b84 (diff)
downloadgit-64646d11773774193093df96020d3fcb0df4a270.tar.gz
Suggest 'add' in am/revert/cherry-pick.
Now that we have decided to make 'add' behave like 'update-index' (and therefore fully classify update-index as strictly plumbing) the am/revert/cherry-pick family of commands should not steer the user towards update-index. Instead send them to the command they probably already know, 'add'. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 5df6787a3f..0126a77b92 100755
--- 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