From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Conrad Irwin <conrad.irwin@gmail.com>,
Frans Klaver <fransklaver@gmail.com>,
git@vger.kernel.org, "Horst H. von Brand" <vonbrand@inf.utfsm.cl>
Subject: Re: git 1.8.0.rc0.18.gf84667d trouble with "git commit -p file"
Date: Sun, 7 Oct 2012 17:49:58 -0400 [thread overview]
Message-ID: <20121007214958.GC1743@sigill.intra.peff.net> (raw)
In-Reply-To: <7vr4paovjq.fsf@alter.siamese.dyndns.org>
On Sun, Oct 07, 2012 at 01:51:21PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > Yes. The more we talk about it, the more turned off I am by the idea.
> > Above I posed my questions as "what _should_ we do when...". And I still
> > think we _should_ default to --only with interactive, if we can find
> > sane semantics. But until we can find them, it obviously does not make
> > sense to enable it, and the whole discussion is stalled. And we must
> > come up with an interim solution that is the least bad.
> >
> > Which is obviously one of:
> >
> > 1. Keep defaulting to "--include", as that is what we have been doing.
> >
> > 2. Forbid the cases where it would matter (i.e., when the index and
> > HEAD differ).
> >
> > The former is more convenient, but the latter is safer against
> > future breakage. I'm OK either way, but option (1) clearly needs a
> > documentation update.
>
> Yeah, I agree with the reasoning. This is an unessential feature
> that is with the problem for a long time, so let's go the route #1
> first before we do anything else.
OK. I think Conrad's patch takes us most of the way there. I had a few
minor comments, but I think another round should do it. Conrad?
-Peff
next prev parent reply other threads:[~2012-10-07 21:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 14:20 git 1.8.0.rc0.18.gf84667d trouble with "git commit -p file" Horst H. von Brand
2012-10-05 19:55 ` Frans Klaver
2012-10-05 22:29 ` Junio C Hamano
2012-10-05 22:57 ` Jeff King
2012-10-06 6:26 ` Junio C Hamano
2012-10-06 13:12 ` Jeff King
2012-10-06 18:22 ` Junio C Hamano
2012-10-06 18:30 ` Jeff King
2012-10-06 18:32 ` Conrad Irwin
2012-10-06 19:07 ` Jeff King
2012-10-07 20:51 ` Junio C Hamano
2012-10-07 21:49 ` Jeff King [this message]
2012-10-07 22:23 ` Junio C Hamano
2012-10-07 22:25 ` Jeff King
2012-10-11 5:51 ` Conrad Irwin
2012-10-11 17:57 ` 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
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=20121007214958.GC1743@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=conrad.irwin@gmail.com \
--cc=fransklaver@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vonbrand@inf.utfsm.cl \
/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).