From: Jean-Noël Avila via GitGitGadget Date: Sat, 16 Mar 2024 15:21:41 GMT Subject: [PATCH 2/2] doc: fix some placeholders formating Message-ID: <6f4e68170391cc123f77a2994f13cfb6e1c3dce3.1710602501.git.gitgitgadget@gmail.com> In-Reply-To: From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- Documentation/git-interpret-trailers.txt | 6 +++--- Documentation/git.txt | 2 +- Documentation/rev-list-options.txt | 6 +++--- builtin/interpret-trailers.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 418265f044d..d9dfb75fef5 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git interpret-trailers' [--in-place] [--trim-empty] - [(--trailer (|)[(=|:)])...] + [(--trailer (|)[(=|:)])...] [--parse] [...] DESCRIPTION @@ -67,9 +67,9 @@ key: value This means that the trimmed and will be separated by `': '` (one colon followed by one space). -For convenience, a can be configured to make using `--trailer` +For convenience, a can be configured to make using `--trailer` shorter to type on the command line. This can be configured using the -'trailer..key' configuration variable. The must be a prefix +'trailer..key' configuration variable. The must be a prefix of the full string, although case sensitivity does not matter. For example, if you have diff --git a/Documentation/git.txt b/Documentation/git.txt index e6b766d5c3a..7a1b112a3e7 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -960,7 +960,7 @@ will never be returned from the commit-graph at the cost of performance. `GIT_PROTOCOL`:: For internal use only. Used in handshaking the wire protocol. Contains a colon ':' separated list of keys with optional values - 'key[=value]'. Presence of unknown keys and values must be + '[=]'. Presence of unknown keys and values must be ignored. + Note that servers may need to be configured to allow this variable to diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 408d9314d08..00ccf687441 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -316,12 +316,12 @@ list. With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown -as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the -reflog) or as `ref@{timestamp}` (with the timestamp for that entry), +as `ref@{}` (where __ is the reverse-chronological index in the +reflog) or as `ref@{}` (with the __ for that entry), depending on a few rules: + -- -1. If the starting point is specified as `ref@{Nth}`, show the index +1. If the starting point is specified as `ref@{}`, show the index format. + 2. If the starting point was specified as `ref@{now}`, show the diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index 11f4ce9e4a2..8768bfea3c4 100644 --- a/builtin/interpret-trailers.c +++ b/builtin/interpret-trailers.c @@ -15,7 +15,7 @@ static const char * const git_interpret_trailers_usage[] = { N_("git interpret-trailers [--in-place] [--trim-empty]\n" - " [(--trailer (|)[(=|:)])...]\n" + " [(--trailer (|)[(=|:)])...]\n" " [--parse] [...]"), NULL }; -- gitgitgadget