From: Junio C Hamano <gitster@pobox.com>
To: Robin Dos Anjos <robin_1997@hotmail.fr>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: General question about "git range-diff"
Date: Fri, 03 Nov 2023 08:21:13 +0900 [thread overview]
Message-ID: <xmqqbkcblp1y.fsf@gitster.g> (raw)
In-Reply-To: <PR3P195MB087847E68AD2032148EFCA039BA6A@PR3P195MB0878.EURP195.PROD.OUTLOOK.COM> (Robin Dos Anjos's message of "Thu, 2 Nov 2023 18:56:39 +0000")
Robin Dos Anjos <robin_1997@hotmail.fr> writes:
> There are several workarounds to this situation.
It would be much better to avoid getting into a problematic
situation in the first place than having to come up with a
workaround for such a situation.
"git imerge" may be a good tool to know about for that. You may be
able to avoid having to say: "Gaahh, I am not patient enough to
rebase this series of commits, even though I spent time to carefully
separate into logical and independent steps. I'll squash them all
into one large blob of changes, even though it means I will lose all
that work."
An "interdiff" that compares the base and the tip of the old and the
new iterations is certainly a way to compare the changes as a whole,
in exchange for loss of the diff between the log messages and other
commit metadata. Adding such a mode to the "range-diff" command
might not be a bad idea.
next prev parent reply other threads:[~2023-11-02 23:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 18:56 General question about "git range-diff" Robin Dos Anjos
2023-11-02 21:48 ` brian m. carlson
2023-11-02 23:21 ` Junio C Hamano [this message]
2023-11-03 1:25 ` Robin Dos Anjos
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=xmqqbkcblp1y.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=robin_1997@hotmail.fr \
/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.