From: John Lee <jjl@pobox.com>
To: git@vger.kernel.org
Subject: Re: Staging commits with visual diff tools?
Date: Wed, 27 May 2015 08:34:43 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.2.10.1505270831490.4687@alice> (raw)
In-Reply-To: <20150527072826.GC6898@peff.net>
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
next prev parent reply other threads:[~2015-05-27 7:35 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 [this message]
2015-05-29 9:57 ` Michael J Gruber
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
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=alpine.DEB.2.10.1505270831490.4687@alice \
--to=jjl@pobox.com \
--cc=git@vger.kernel.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.
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).