summaryrefslogtreecommitdiff
path: root/git-revert.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-22 02:30:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-22 04:33:49 (GMT)
commit64646d11773774193093df96020d3fcb0df4a270 (patch)
treef05a139f4d1de6a9113341ad3d0d8222cf7ddee4 /git-revert.sh
parentcaba139d432c420f853c352987cf29cefafc2b84 (diff)
downloadgit-64646d11773774193093df96020d3fcb0df4a270.zip
git-64646d11773774193093df96020d3fcb0df4a270.tar.gz
git-64646d11773774193093df96020d3fcb0df4a270.tar.bz2
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>
Diffstat (limited to 'git-revert.sh')
-rwxr-xr-xgit-revert.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-revert.sh b/git-revert.sh
index 6eab3c7..50cc47b 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)