From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge: use editor by default in interactive sessions
Date: Mon, 23 Jan 2012 14:34:35 -0800 [thread overview]
Message-ID: <7vaa5e6oas.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4F1DDECB.5080904@alum.mit.edu> (Michael Haggerty's message of "Mon, 23 Jan 2012 23:27:23 +0100")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> On 01/23/2012 11:18 PM, Junio C Hamano wrote:
>> Traditionally, a cleanly resolved merge was committed by "git merge" using
>> the auto-generated merge commit log message with invoking the editor.
>
> s/with/without/
Oops, thanks, ... goes to find a hole to crawl into ...
next prev parent reply other threads:[~2012-01-23 22:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 22:18 [PATCH] merge: use editor by default in interactive sessions Junio C Hamano
2012-01-23 22:27 ` Michael Haggerty
2012-01-23 22:34 ` Junio C Hamano [this message]
2012-01-30 17:06 ` Thomas Rast
2012-01-30 18:17 ` Junio C Hamano
2012-01-30 20:25 ` [PATCH] merge: add instructions to the commit message when editing Thomas Rast
2012-01-30 21:03 ` Junio C Hamano
2012-01-30 21:43 ` Thomas Rast
2012-01-30 21:52 ` Junio C Hamano
2012-01-31 7:46 ` Thomas Rast
2012-02-23 12:43 ` [PATCH] merge: use editor by default in interactive sessions Erik Faye-Lund
2012-02-23 19:23 ` Junio C Hamano
2012-02-23 20:26 ` Junio C Hamano
2012-02-23 20:31 ` Erik Faye-Lund
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vaa5e6oas.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).