author | Junio C Hamano <junkio@cox.net> | |
Tue, 21 Feb 2006 08:28:04 +0000 (00:28 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 21 Feb 2006 08:28:04 +0000 (00:28 -0800) | ||
commit | 0f73e92ab78f1978da22746d3aacdd134b87d013 | |
tree | 1845e265625eff4d5545b041fb3071fe1116add0 | tree | snapshot |
parent | d37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82 | commit | 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 <junkio@cox.net>
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>
git-revert.sh | diff | blob | history |