[PATCH] Suggest 'add' in am/revert/cherry-pick.
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Dec 22, 2006, 02:30 UTC
- Message-ID
- <20061222023017.GA15136@spearce.org>
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> --- 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 5df6787..0126a77 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 6eab3c7..50cc47b 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 <paths>'" + echo >&2 "mark the corrected paths with 'git-add <paths>'" echo >&2 "and commit the result." case "$me" in cherry-pick)
-- 1.4.4.3.g87d8