From: Michael J Gruber <git@drmicha.warpmail.net>
To: John Lee <jjl@pobox.com>, git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: Staging commits with visual diff tools?
Date: Fri, 29 May 2015 11:57:44 +0200 [thread overview]
Message-ID: <55683818.5010002@drmicha.warpmail.net> (raw)
In-Reply-To: <alpine.DEB.2.10.1505270831490.4687@alice>
John Lee venit, vidit, dixit 27.05.2015 09:34:
> On Wed, 27 May 2015, Jeff King wrote:
>
>> If you are interested in looking further, see how the %patch_mode hash
>> is defined in git-add--interactive.perl. Specifically, note that "add
>> -p" is just one case: diff against the index and apply with "apply
>> --cached". But once you have a separate tool for picking hunks, you
>> should be able to drop in the different DIFF/APPLY pairs to implement
>> "checkout -p", etc.
>
> My plan was to use symlinks, checkout-index, and update-index
> --index-info, similar to how difftool does it. I verified on the command
> line that that seems to work.
>
>
> John
>
Yes, having "git addtool" (or "stagetool") to go with difftool and merge
tool would be nice, and it could hopefully resuse code or infrastructure
from those tools, as well as the tool config.
I vaguely remember a sketch or proof-of-concept by Jeff (not reusing
*tool) but may be wrong.
Michael
next prev parent reply other threads:[~2015-05-29 9:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 20:50 Staging commits with visual diff tools? John Lee
2015-05-27 7:28 ` Jeff King
2015-05-27 7:34 ` John Lee
2015-05-29 9:57 ` Michael J Gruber [this message]
2015-05-31 1:59 ` David Aguilar
2015-05-31 9:36 ` John Lee
2015-06-01 2:25 ` David Aguilar
2015-06-01 19:36 ` John Lee
2015-06-27 23:23 ` John Lee
2015-06-28 17:56 ` John Lee
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=55683818.5010002@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=jjl@pobox.com \
--cc=peff@peff.net \
/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.