From: Andreas Krey <a.krey@gmx.de>
Date: Thu, 06 Oct 2011 20:19:07 GMT
Subject: Re: Prompt for merge message?
Message-ID: <20111006201907.GA27744@inner.h.iocl.org>
In-Reply-To: <20111006182534.GA13628@vfa-6h>

On Thu, 06 Oct 2011 11:25:34 +0000, Jacob Helwig wrote:
> "git merge --no-ff --no-commit branch_foo && git commit" ?

"git merge --no-ff branch_foo && git commit --amend"

Andreas