diff options
| -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 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 <paths>'" + echo >&2 "mark the corrected paths with 'git-add <paths>'" echo >&2 "and commit the result." case "$me" in cherry-pick) |