Merge branch 'wc/rebase-insn'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:00:28 +0000 (23:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:00:28 +0000 (23:00 -0800)
commit5b0d61637c21d80bcc781aa135ed1959326713bb
treee8f7c7dd036b9f3a4bc4aa6c3e02462f2fa4c10a
parenta1d3b0cae1f98b6347a3ee706973914acf16c072
parent0d8135891eb81d06d818a53c479ea3798df96e3a
Merge branch 'wc/rebase-insn'

* 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