From: Andreas Krey <a.krey@gmx.de>
To: Jacob Helwig <jacob@technosorcery.net>
Cc: "Todd A. Jacobs" <nospam+listmail@codegnome.org>, git@vger.kernel.org
Subject: Re: Prompt for merge message?
Date: Thu, 6 Oct 2011 22:19:07 +0200 [thread overview]
Message-ID: <20111006201907.GA27744@inner.h.iocl.org> (raw)
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
next prev parent reply other threads:[~2011-10-06 20:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 17:49 Prompt for merge message? Todd A. Jacobs
2011-10-06 18:25 ` Jacob Helwig
2011-10-06 18:51 ` in-gitvger
2011-10-06 20:15 ` Stephen Bash
2011-10-06 20:19 ` Andreas Krey [this message]
2011-10-06 22:02 ` Junio C Hamano
2011-10-06 22:09 ` Shawn Pearce
2011-10-06 23:17 ` Junio C Hamano
2011-10-07 1:15 ` Todd A. Jacobs
2011-10-07 3:07 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111006201907.GA27744@inner.h.iocl.org \
--to=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=jacob@technosorcery.net \
--cc=nospam+listmail@codegnome.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).