From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Dec 2007 07:00:28 +0000 (-0800)
Subject: Merge branch 'wc/rebase-insn'
X-Git-Tag: v1.5.4-rc0~106
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b0d61637c21d80bcc781aa135ed1959326713bb;p=git.git

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
---

5b0d61637c21d80bcc781aa135ed1959326713bb