mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
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>
This commit is contained in:
parent
caba139d43
commit
64646d1177
|
@ -401,14 +401,14 @@ do
|
||||||
changed="$(git-diff-index --cached --name-only HEAD)"
|
changed="$(git-diff-index --cached --name-only HEAD)"
|
||||||
if test '' = "$changed"
|
if test '' = "$changed"
|
||||||
then
|
then
|
||||||
echo "No changes - did you forget update-index?"
|
echo "No changes - did you forget to use 'git add'?"
|
||||||
stop_here_user_resolve $this
|
stop_here_user_resolve $this
|
||||||
fi
|
fi
|
||||||
unmerged=$(git-ls-files -u)
|
unmerged=$(git-ls-files -u)
|
||||||
if test -n "$unmerged"
|
if test -n "$unmerged"
|
||||||
then
|
then
|
||||||
echo "You still have unmerged paths in your index"
|
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
|
stop_here_user_resolve $this
|
||||||
fi
|
fi
|
||||||
apply_status=0
|
apply_status=0
|
||||||
|
|
|
@ -155,7 +155,7 @@ Conflicts:
|
||||||
uniq
|
uniq
|
||||||
} >>"$GIT_DIR/MERGE_MSG"
|
} >>"$GIT_DIR/MERGE_MSG"
|
||||||
echo >&2 "Automatic $me failed. After resolving the conflicts,"
|
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."
|
echo >&2 "and commit the result."
|
||||||
case "$me" in
|
case "$me" in
|
||||||
cherry-pick)
|
cherry-pick)
|
||||||
|
|
Loading…
Reference in a new issue