From: Junio C Hamano <gitster@pobox.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: Alex Riesen <raa.lkml@gmail.com>,
Caleb Cushing <xenoterracide@gmail.com>,
git@vger.kernel.org
Subject: Re: auto commit merge using the default merge message
Date: Thu, 23 Apr 2009 01:32:20 -0700 [thread overview]
Message-ID: <7vocunwz1n.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <49F025E7.7090404@drmicha.warpmail.net> (Michael J. Gruber's message of "Thu, 23 Apr 2009 10:25:11 +0200")
Michael J Gruber <git@drmicha.warpmail.net> writes:
> I think he wants the auto generated message which may be different for
> each merge. Maybe something like
>
> GIT_EDITOR=/bin/true git commit
>
> will do the trick.
Use "GIT_EDITOR=:" instead. It also is *true* just like /bin/true, but
git knows a simple magic about this and avoids an extra fork+exec.
A similar trick exists for GIT_PAGER=cat (not "/bin/cat"), by the way.
next prev parent reply other threads:[~2009-04-23 8:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-23 7:46 auto commit merge using the default merge message Caleb Cushing
2009-04-23 7:57 ` Alex Riesen
2009-04-23 8:25 ` Michael J Gruber
2009-04-23 8:32 ` Junio C Hamano [this message]
2009-04-23 9:07 ` Michael J Gruber
2009-04-23 16:19 ` Brian Gernhardt
2009-04-24 1:31 ` Caleb Cushing
2009-04-24 14:06 ` Jeff King
2009-04-24 17:50 ` Caleb Cushing
2009-04-24 17:55 ` Jeff King
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=7vocunwz1n.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=raa.lkml@gmail.com \
--cc=xenoterracide@gmail.com \
/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).