From 64646d11773774193093df96020d3fcb0df4a270 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 21 Dec 2006 21:30:17 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-am.sh | 4 ++-- git-revert.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-am.sh b/git-am.sh index 5df6787a3..0126a77b9 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 diff --git a/git-revert.sh b/git-revert.sh index 6eab3c72d..50cc47b06 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -155,7 +155,7 @@ Conflicts: uniq } >>"$GIT_DIR/MERGE_MSG" echo >&2 "Automatic $me failed. After resolving the conflicts," - echo >&2 "mark the corrected paths with 'git-update-index '" + echo >&2 "mark the corrected paths with 'git-add '" echo >&2 "and commit the result." case "$me" in cherry-pick) -- 2.26.2