diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:28:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:28:04 -0800 |
| commit | 0f73e92ab78f1978da22746d3aacdd134b87d013 (patch) | |
| tree | 1845e265625eff4d5545b041fb3071fe1116add0 /git-revert.sh | |
| parent | d37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82 (diff) | |
| download | git-0f73e92ab78f1978da22746d3aacdd134b87d013.tar.gz git-0f73e92ab78f1978da22746d3aacdd134b87d013.tar.xz | |
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>
Diffstat (limited to 'git-revert.sh')
| -rwxr-xr-x | git-revert.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-revert.sh b/git-revert.sh index 2c5870684..c19d3a691 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 <paths>'" + 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" |