path: root/
diff options
authorJunio C Hamano <>2006-02-21 08:28:04 (GMT)
committerJunio C Hamano <>2006-02-21 08:28:04 (GMT)
commit0f73e92ab78f1978da22746d3aacdd134b87d013 (patch)
tree1845e265625eff4d5545b041fb3071fe1116add0 /
parentd37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82 (diff)
cherry-pick/revert: error-help message rewording.
It said "after fixing up, commit the result using -F .msg", but it was not clear for new people how "fix up" should be done. Hint "git-update-index <path>". We could recommend "git commit -a -F .msg" instead, but I am hesitant to give that suggestion in the blind -- you could do a cherry-pick, revert or a merge in general in a dirty working tree as long as local modifications do not overlap with the merge, but using "commit -a" would include them in the result. Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 3 insertions, 2 deletions
diff --git a/ b/
index 2c58706..c19d3a6 100755
--- a/
+++ b/
@@ -141,8 +141,9 @@ git-read-tree -m -u $base $head $next &&
result=$(git-write-tree 2>/dev/null) || {
echo >&2 "Simple $me fails; trying Automatic $me."
git-merge-index -o git-merge-one-file -a || {
- echo >&2 "Automatic $me failed. After fixing it up,"
- echo >&2 "you can use \"git commit -F .msg\""
+ echo >&2 "Automatic $me failed. After resolving the conflicts,"
+ echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
+ echo >&2 "and commit with 'git commit -F .msg'"
case "$me" in
echo >&2 "You may choose to use the following when making"