Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Julia Evans via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  "D. Ben Knoble" <ben.knoble@gmail.com>,
	 Tuomas Ahola <taahol@utu.fi>,  Jeff King <peff@peff.net>,
	 Kaartic Sivaraam <kaartic.sivaraam@gmail.com>,
	 Julia Evans <julia@jvns.ca>
Subject: Re: [PATCH v3] doc: git-diff: rewrite EXAMPLES section
Date: Wed, 11 Nov 2026 13:52:00 -0800	[thread overview]
Message-ID: <xmqqik23m3y7.fsf@gitster.g> (raw)
In-Reply-To: <pull.2293.v3.git.1794427993457.gitgitgadget@gmail.com> (Julia Evans via GitGitGadget's message of "Wed, 11 Nov 2026 20:13:13 +0000")

"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Julia Evans <julia@jvns.ca>
>
> The top piece of feedback users always give about man pages is always
> that they want better examples that are relevant to them.
>
> The EXAMPLES section's structure has remained mostly unchanged since
> 2007, which was before we knew how people were going to use `git diff`.
> Update it with ways of using `git diff` that are popular with Git
> users, gathered by asking Mastodon users for their most commonly used
> incantations. Keep the example that was added since 2007
> (`git diff AUTO_MERGE`), rewording it to use the more familiar term
> "merge conflict" instead of "textual conflict".

Thanks.  Will replace.

      reply	other threads:[~2026-11-11 21:52 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
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 [this message]

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=xmqqik23m3y7.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=ben.knoble@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=julia@jvns.ca \
    --cc=kaartic.sivaraam@gmail.com \
    --cc=peff@peff.net \
    --cc=taahol@utu.fi \
    /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