git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Staging commits with visual diff tools?

From
JLJohn Lee <jjl@pobox.com>
Date
May 27, 2015, 07:34 UTC
Message-ID
<alpine.DEB.2.10.1505270831490.4687@alice>
In-Reply-To
<20150527072826.GC6898@peff.net>
On Wed, 27 May 2015, Jeff King wrote:
Show 6 quoted lines
> 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
Previous: Jeff KingNext: Michael J Gruber
Message 3 of 10 in “Staging commits with visual diff tools?”
  1. John LeeMay 26, 2015
  2. Jeff KingMay 27, 2015
  3. John LeeMay 27, 2015
  4. Michael J GruberMay 29, 2015
  5. David AguilarMay 31, 2015
  6. John LeeMay 31, 2015
  7. David AguilarJun 1, 2015
  8. John LeeJun 1, 2015
  9. John LeeJun 27, 2015
  10. John LeeJun 28, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.