From: Julia Evans <julia@jvns.ca>
To: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Cc: Julia Evans <gitgitgadget@gmail.com>,
git@vger.kernel.org, "D. Ben Knoble" <ben.knoble@gmail.com>,
Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2] doc: git-diff: rewrite EXAMPLES section
Date: Wed, 11 Nov 2026 15:17:39 -0500 [thread overview]
Message-ID: <543df224-2385-4a89-a25b-41cb0cd46f30@jvns.ca> (raw)
In-Reply-To: <df9ed9b6-978e-413e-b001-b4f10c84a114@gmail.com>
On 2026-11-10 10:25 a.m., Kaartic Sivaraam wrote:
> On 11/10/26 19:16, Julia Evans wrote:
>>
>> On Mon, Nov 9, 2026, at 5:40 PM, Junio C Hamano wrote:
>>> Junio C Hamano <gitster@pobox.com> writes:
>>>>
>>>> In any case, I'll queue another SQUASH??? commit on top of the topic
>>>> until v3 materiazlies to fix these issues we have accumulated so
>>>> far.
>>
>> Thanks for this, I don't know how to apply a patch from an email but
>> I'll ask in the Discord to try to learn how. Same for the other changes.
>
> As mentioned in Discord, when Junio mentions something along the lines
> of "I'll queue another SQUASH??? commit" , it means he would've
> already queued the SQUASH commit in the topic branch in his tree. You
> can view the same using something like:
>
> $ git remote add jch https://github.com/gitster/git
> $ git fetch jch je/doc-git-diff-examples
> $ git log FETCH_HEAD
>
> Then on your local topic branch, you can do:
>
> $ git cherry-pick --no-commit <List_of_SQUASH_commit_ID...>
>
> Hope this helps.
Thanks, that was exactly what I needed.
next prev parent reply other threads:[~2026-11-11 20:17 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 15:33 [PATCH] doc: git-diff: rewrite EXAMPLES section Julia Evans via GitGitGadget
2026-11-03 17:16 ` Julia Evans
2026-11-03 19:44 ` Junio C Hamano
2026-11-03 19:52 ` Julia Evans
2026-11-03 20:33 ` Junio C Hamano
2026-11-03 20:45 ` Julia Evans
2026-11-03 21:42 ` Junio C Hamano
2026-11-05 15:40 ` [PATCH v2] " Julia Evans via GitGitGadget
2026-11-05 16:46 ` Junio C Hamano
2026-11-05 18:18 ` Junio C Hamano
2026-11-09 12:48 ` D. Ben Knoble
2026-11-10 13:43 ` Julia Evans
2026-11-05 17:23 ` Tuomas Ahola
2026-11-05 19:45 ` Junio C Hamano
2026-11-05 19:46 ` Junio C Hamano
2026-11-08 2:37 ` Jeff King
2026-11-08 4:35 ` Junio C Hamano
2026-11-09 18:53 ` Jeff King
2026-11-09 20:31 ` Junio C Hamano
2026-11-09 22:20 ` Junio C Hamano
2026-11-09 22:40 ` Junio C Hamano
2026-11-09 23:09 ` Jeff King
2026-11-10 13:46 ` Julia Evans
2026-11-10 15:25 ` Kaartic Sivaraam
2026-11-11 20:17 ` Julia Evans [this message]
2026-11-10 17:22 ` Junio C Hamano
2026-11-11 20:13 ` [PATCH v3] " Julia Evans via GitGitGadget
2026-11-11 21:52 ` Junio C Hamano
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=543df224-2385-4a89-a25b-41cb0cd46f30@jvns.ca \
--to=julia@jvns.ca \
--cc=ben.knoble@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=peff@peff.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox