![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Dec 2007 07:00:28 +0000 (23:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Dec 2007 07:00:28 +0000 (23:00 -0800) |
* wc/rebase-insn:
Mention that git-rm can be an appropriate resolution as well as git-add.
revert/cherry-pick: Allow overriding the help text by the calling Porcelain
Mention that git-rm can be an appropriate resolution as well as git-add.
revert/cherry-pick: Allow overriding the help text by the calling Porcelain
Trivial merge