diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2006-12-21 21:30:17 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-21 20:33:49 -0800 |
| commit | 64646d11773774193093df96020d3fcb0df4a270 (patch) | |
| tree | f05a139f4d1de6a9113341ad3d0d8222cf7ddee4 | |
| parent | Use git-merge-file in git-merge-one-file, too (diff) | |
| download | tgif-64646d11773774193093df96020d3fcb0df4a270.tar.xz | |
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>
| -rwxr-xr-x | git-am.sh | 4 | ||||
| -rwxr-xr-x | git-revert.sh | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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 6eab3c72df..50cc47b063 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) |