From d11a2342a7cfc922d2707a491a6178bcc837c0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Sun, 16 Nov 2025 15:22:50 +0100 Subject: [PATCH 1/2] doc: fix and unify descriptions of diff context options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These two options are described inconsistently in the documentation across diff-context-options.adoc and diff-options.adoc and the placeholders are not consistent with other diff options. Signed-off-by: Jean-Noël Avila --- Documentation/diff-context-options.adoc | 4 ++-- Documentation/diff-options.adoc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/diff-context-options.adoc b/Documentation/diff-context-options.adoc index e161260358fff5..7576f436352170 100644 --- a/Documentation/diff-context-options.adoc +++ b/Documentation/diff-context-options.adoc @@ -4,7 +4,7 @@ or 3 if the config option is unset. `--inter-hunk-context=`:: - Show the context between diff hunks, up to the specified __ - of lines, thereby fusing hunks that are close to each other. + Show the context between diff hunks, up to __ + lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset. diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc index ae31520f7f1d13..b0773c453cfd19 100644 --- a/Documentation/diff-options.adoc +++ b/Documentation/diff-options.adoc @@ -127,8 +127,8 @@ endif::git-log[] `-U`:: `--unified=`:: - Generate diffs with __ lines of context instead of - the usual three. + Generate diffs with __ lines of context. Defaults to `diff.context` + or 3 if the config option is unset. ifndef::git-format-patch[] Implies `--patch`. endif::git-format-patch[] @@ -806,9 +806,9 @@ endif::git-format-patch[] Ignore changes whose all lines match __. This option may be specified more than once. -`--inter-hunk-context=`:: - Show the context between diff hunks, up to the specified __ - of lines, thereby fusing hunks that are close to each other. +`--inter-hunk-context=`:: + Show the context between diff hunks, up to __ + lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset. From f9d73071fc3c473a7753b30881703078b8ae9e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Sun, 16 Nov 2025 15:41:14 +0100 Subject: [PATCH 2/2] doc: fix missing basic markup in git-checkout documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila --- Documentation/git-checkout.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-checkout.adoc b/Documentation/git-checkout.adoc index 6f281b298efac1..b0f10f4f5d29df 100644 --- a/Documentation/git-checkout.adoc +++ b/Documentation/git-checkout.adoc @@ -161,7 +161,7 @@ of it"). `--track[=(direct|inherit)]`:: When creating a new branch, set up "upstream" configuration. See `--track` in linkgit:git-branch[1] for details. As a convenience, - --track without -b implies branch creation. + `--track` without `-b` implies branch creation. + If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of