Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Julia Evans via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org,  "D. Ben Knoble" <ben.knoble@gmail.com>,
	 Julia Evans <julia@jvns.ca>
Subject: Re: [PATCH v2] doc: git-diff: rewrite EXAMPLES section
Date: Mon, 09 Nov 2026 14:40:20 -0800	[thread overview]
Message-ID: <xmqqo6bxvdbf.fsf@gitster.g> (raw)
In-Reply-To: <xmqqa4nhwstl.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 09 Nov 2026 14:20:06 -0800")

Junio C Hamano <gitster@pobox.com> writes:

> Jeff King <peff@peff.net> writes:
>
>> On Thu, Nov 05, 2026 at 03:40:17PM +0000, Julia Evans via GitGitGadget wrote:
>>
>>> +[[name_only]]
>>>  `--name-only`::
>>>  	Show only the name of each changed file in the post-image tree.
>>>  	The file names are often encoded in UTF-8.
>>>  	For more information see the discussion about encoding in the linkgit:git-log[1]
>>>  	manual page.
>>
>> Sadly this syntax seems to work with Asciidoctor, but not Asciidoc. The
>> latter doesn't create the anchors, and then xmlto complaints that the
>> result doesn't validate.
>>
>> Doing it like this works in both:
>>
>>   `--name-only`[[name_only]]::
>> 	...
>>
>> but...yikes. It's pretty ugly. This of course tempts me in the direction
>> of ditching python asciidoc support, but I'm not sure if you want to
>> hold up your series for that.
>
> 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.

And I realized that we need yet another SQUASH to address "isn't it
a value of another option?"  point.

    SQUASH???
    
    it is likely that the annotation was meant to go with --dashed-option

diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
index bb46fd065b..dbac3b8275 100644
--- a/Documentation/diff-options.adoc
+++ b/Documentation/diff-options.adoc
@@ -417,7 +417,7 @@ endif::git-diff[]
 	Ignore changes in amount of whitespace.  This ignores whitespace
 	at line end, and considers all other sequences of one or
 	more whitespace characters to be equivalent.
-`ignore-all-space`[[ignore_all_space]]::
+`ignore-all-space`::
 	Ignore whitespace when comparing lines. This ignores differences
 	even if one line has whitespace where the other line has none.
 `allow-indentation-change`::
@@ -783,7 +783,7 @@ endif::git-format-patch[]
 	more whitespace characters to be equivalent.
 
 `-w`::
-`--ignore-all-space`::
+`--ignore-all-space`[[ignore_all_space]]::
 	Ignore whitespace when comparing lines.  This ignores
 	differences even if one line has whitespace where the other
 	line has none.

  reply	other threads:[~2026-11-09 22:40 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 [this message]
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

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=xmqqo6bxvdbf.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=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