@matheusbsbs / matheus-bagliano / commits / 0f73e92ab7
Fork 0

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 <junkio@cox.net>

Junio C Hamano committed Feb 21, 2006 at 00:28 UTC 0f73e92ab78f1978da22746d3aacdd134b87d013
1 file changed +3 -2
git-revert.sh
+3 -2
@@ -141,8 +141,9 @@ git-read-tree -m -u $base $head $next &&
141 result=$(git-write-tree 2>/dev/null) || {
142 echo >&2 "Simple $me fails; trying Automatic $me."
143 git-merge-index -o git-merge-one-file -a || {
144 - echo >&2 "Automatic $me failed. After fixing it up,"
145 - echo >&2 "you can use \"git commit -F .msg\""
144 + echo >&2 "Automatic $me failed. After resolving the conflicts,"
145 + echo >&2 "mark the corrected paths with 'git-update-index <paths>'"
146 + echo >&2 "and commit with 'git commit -F .msg'"
147 case "$me" in
148 cherry-pick)
149 echo >&2 "You may choose to use the following when making"