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

Specify resume point with git difftool?

From
Ryan Zoeller <rtzoeller@rtzoeller.com>
Date
Nov 16, 2020, 16:45 UTC
Message-ID
<gOXOaoqn-E9A2ob7ykWEcDc7ZxmSwAjcP5CCFKfr5ejCOWZQ1lfAUZcbgYT9AyQCcDgJvCrnrtziXiels-Hxol3xlkGTVHk24SvAdaSUtKQ=@rtzoeller.com>
Hi everyone,
I use git quite a bit while working with some binary files which require a custom diff tool. I'll typically review changes with a command like
git difftool --tool toolname main... -- *.extension
Frequently I'll finish reviewing a file and close the diffing program, only to realize that I wanted to look at part of the diff again -- e.g. after viewing a few other files and wanting some additional context.
Typically I end up killing the current difftool prompt, rewriting my difftool command to specify the file I want to re-review, and upon finishing that re-review running the original difftool command. However upon running the original command I find myself just answering 'n' to all of the prompts until I get back to where I was, which can be a bit painful.
Is there a way to tell git "resume the difftool process at file n"? The difftool prompt counts which file I'm on ("Viewing (10/20): 'filename'"), so it seems like I ought to be able to jump ahead by specifying a starting index (or range to view).

Thanks, Ryan Zoeller

Next: Junio C Hamano
Message 1 of 2 in “Specify resume point with git difftool?”
  1. Ryan ZoellerNov 16, 2020
  2. Junio C HamanoNov 16, 2020

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.