@matheusbsbs / matheus-bagliano / commits / 64646d1177
Fork 0

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>

Shawn O. Pearce committed Dec 21, 2006 at 21:30 UTC 64646d11773774193093df96020d3fcb0df4a270
2 files changed +3 -3
git-am.sh
+2 -2
@@ -401,14 +401,14 @@ do
401 changed="$(git-diff-index --cached --name-only HEAD)"
402 if test '' = "$changed"
403 then
404 - echo "No changes - did you forget update-index?"
404 + echo "No changes - did you forget to use 'git add'?"
405 stop_here_user_resolve $this
406 fi
407 unmerged=$(git-ls-files -u)
408 if test -n "$unmerged"
409 then
410 echo "You still have unmerged paths in your index"
411 - echo "did you forget update-index?"
411 + echo "did you forget to use 'git add'?"
412 stop_here_user_resolve $this
413 fi
414 apply_status=0
git-revert.sh
+1 -1
@@ -155,7 +155,7 @@ Conflicts:
155 uniq
156 } >>"$GIT_DIR/MERGE_MSG"
157 echo >&2 "Automatic $me failed. After resolving the conflicts,"
158 - echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
158 + echo >&2 "mark the corrected paths with 'git-add <paths>'"
159 echo >&2 "and commit the result."
160 case "$me" in
161 cherry-pick)