summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: caba139)
raw | patch | inline | side by side (parent: caba139)
author | Shawn O. Pearce <spearce@spearce.org> | |
Fri, 22 Dec 2006 02:30:17 +0000 (21:30 -0500) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Fri, 22 Dec 2006 04:33:49 +0000 (20:33 -0800) |
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>
(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>
git-am.sh | patch | blob | history | |
git-revert.sh | patch | blob | history |
diff --git a/git-am.sh b/git-am.sh
index 5df6787a3f285f18d3a41c1ab2f0579f407e02de..0126a77b924e7f1fe7f3913b84350ab35e6e043a 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
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 6eab3c72df0db0994a352836018a7fc35ba1eae3..50cc47b0634201e7acaaa0a0642be779aaf7c2da 100755 (executable)
--- a/git-revert.sh
+++ b/git-revert.sh
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)