Re: git commit -v does not removes the patch

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Nov 20, 2008, 13:09 UTC
Message-ID: <20081120130851.GA17608@neumann>
In-Reply-To: <20081112081609.GA3720@coredump.intra.peff.net>

Hi,

On Wed, Nov 12, 2008 at 03:16:09AM -0500, Jeff King wrote:

> Here's a patch series that at least improves the situation by turning
> off the diff-stripping if we never put in a diff in the first place.
> That way only people who actually _use_ "-v" will have to pay for it.

I always want to see the diff while editing a commit message, even if it's the commit message of a merge, a revert, a squash in rebase. Since these commands do not have an option equivalent to 'git commit -v', I wrote a little prepare-commit-msg hook to always append the appropriate diff to the end of the appropriate commit message file. This worked pretty well for the last couple of months, until 5/5 got into maint.

So, what is the/is there a preferred way to always include the diff in the commit message template and get it removed automatically? Are there any workarounds other than revert that commit locally?

Thanks, Gábor