From: Ryan Zoeller <firstname.lastname@example.org>
To: "email@example.com" <firstname.lastname@example.org>
Subject: Specify resume point with git difftool?
Date: Mon, 16 Nov 2020 16:45:02 +0000 [thread overview]
Message-ID: <gOXOaoqn-E9A2ob7ykWEcDc7ZxmSwAjcP5CCFKfr5ejCOWZQ1lfAUZcbgYT9AyQCcDgJvCrnrtziXiels-Hxol3xlkGTVHk24SvAdaSUtKQemail@example.com> (raw)
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).
next reply other threads:[~2020-11-16 16:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 16:45 Ryan Zoeller [this message]
2020-11-16 19:26 ` Specify resume point with git difftool? Junio C Hamano
2021-02-07 12:57 胡哲宁
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:
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 \
* 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
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).