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 /diffcore-break.c | |
| parent | Fix fmt-merge-msg counting. (diff) | |
| download | git-0f73e92ab78f1978da22746d3aacdd134b87d013.tar.gz git-0f73e92ab78f1978da22746d3aacdd134b87d013.zip | |
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 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions