From 0f73e92ab78f1978da22746d3aacdd134b87d013 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 21 Feb 2006 00:28:04 -0800 Subject: [PATCH] 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 ". 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 --- git-revert.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-revert.sh b/git-revert.sh index 2c587068..c19d3a69 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -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 '" + echo >&2 "and commit with 'git commit -F .msg'" case "$me" in cherry-pick) echo >&2 "You may choose to use the following when making" -- 2.11.0