From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Thomas Rast <trast@student.ethz.ch>,
Jonathan Nieder <jrnieder@gmail.com>,
Josh Triplett <josh@joshtriplett.org>,
git@vger.kernel.org, Wincent Colaiuta <win@wincent.com>
Subject: Re: Please support add -p with a new file, to add only part of the file
Date: Tue, 10 Jan 2012 14:38:57 -0500 [thread overview]
Message-ID: <20120110193857.GA19665@sigill.intra.peff.net> (raw)
In-Reply-To: <7vd3ar9wto.fsf@alter.siamese.dyndns.org>
On Tue, Jan 10, 2012 at 11:33:39AM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> >> Even if you start with "add -N", there won't be individual "hunks" you can
> >> pick and choose from diffing emptiness and the whole new file, so you end
> >> up using "edit hunk" interface.
> >
> > I don't think the main impetus for this is that people necessarily want
> > to pick and choose hunks from added files.
>
> Well, read the subject of your e-mail and tell me what it says ;-)
Heh. Oops.
Yes, I agree that "add -p" is not especially useful for that case, and
the workflow I was describing is very different[1].
Sorry for the noise.
-Peff
[1] For the record, I _do_ find myself using "git add -N" so that new
files can be part of my "git add -p" workflow. So that feature is
working as intended. It would save me a little bit of effort,
though, if I could tell git I also want to include untracked files
during the "-p" session, and dispense with the earlier "add -N".
I'd also find it useful to mark conflicts as resolved, but I think
we discussed that once before and you brought up some ugly corner
cases.
next prev parent reply other threads:[~2012-01-10 19:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120109105134.1239.39047.reportbug@leaf>
2012-01-09 20:47 ` Please support add -p with a new file, to add only part of the file Jonathan Nieder
2012-01-10 14:07 ` Thomas Rast
2012-01-10 18:32 ` Junio C Hamano
2012-01-10 18:38 ` Jeff King
2012-01-10 19:33 ` Junio C Hamano
2012-01-10 19:38 ` Jeff King [this message]
2012-01-10 22:29 ` Josh Triplett
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=20120110193857.GA19665@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=josh@joshtriplett.org \
--cc=jrnieder@gmail.com \
--cc=trast@student.ethz.ch \
--cc=win@wincent.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).