From: Junio C Hamano <gitster@pobox.com>
To: Nanako Shiraishi <nanako3@lavabit.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Nathan Yergler <nathan@creativecommons.org>,
Michael J Gruber <git@drmicha.warpmail.net>,
Asheesh Laroia <asheesh@asheesh.org>,
git@vger.kernel.org
Subject: Re: Short "git commit $file" syntax fails in the face of a resolved conflict
Date: Thu, 22 Jan 2009 22:15:39 -0800 [thread overview]
Message-ID: <7viqo64kfo.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20090123094509.6117@nanako3.lavabit.com> (Nanako Shiraishi's message of "Fri, 23 Jan 2009 09:45:09 +0900")
Nanako Shiraishi <nanako3@lavabit.com> writes:
> But Nathan's first sentence is a different matter. I do not think it is
> coming from the same confusion, and I think the question is a valid
> one. Your answer does not explain why it is a bad idea to change the
> behavior of "git commit path" to what "git commit -i path" does during a
> merge.
>
> The answer of course can be "because it changes the behavior people are
> very much used to."
[jc: how many times do I have to ask you to wrap your lines, by the way?]
I tend to agree that "very much used to" argument carries much weight, but
I'll be sending a three-patch series to weatherbaloon the idea.
next prev parent reply other threads:[~2009-01-23 6:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-21 21:00 Short "git commit $file" syntax fails in the face of a resolved conflict Asheesh Laroia
2009-01-21 21:35 ` Michael J Gruber
2009-01-21 21:46 ` Nathan Yergler
2009-01-22 7:28 ` Johannes Sixt
2009-01-23 0:45 ` Nanako Shiraishi
2009-01-23 2:55 ` Asheesh Laroia
2009-01-23 6:15 ` Junio C Hamano [this message]
2009-01-23 6:17 ` [PATCH 1/3] Add "partial commit" tests during a conflicted merge Junio C Hamano
2009-01-23 7:09 ` Johannes Sixt
2009-01-23 7:16 ` Junio C Hamano
2009-01-23 7:32 ` Johannes Sixt
2009-01-23 7:39 ` Junio C Hamano
2009-01-23 6:19 ` [PATCH 2/3] builtin-commit: shorten eye-sore overlong lines Junio C Hamano
2009-01-23 6:21 ` [PATCH 3/3] git commit: pathspec without -i/-o implies -i semantics during a merge Junio C Hamano
2009-01-23 9:51 ` Pieter de Bie
2009-01-23 17:01 ` Junio C Hamano
2009-01-22 9:17 ` Short "git commit $file" syntax fails in the face of a resolved conflict Michael J Gruber
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=7viqo64kfo.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=asheesh@asheesh.org \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=nanako3@lavabit.com \
--cc=nathan@creativecommons.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.