diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index 418265f044d650..d9dfb75fef525f 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 0d25224c969694..b0c05bbd0d2d14 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -942,7 +942,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 a583b52c612aec..1bfc9270f75957 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 033bd1556cf9f8..582ace8966b034 100644 --- a/builtin/interpret-trailers.c +++ b/builtin/interpret-trailers.c @@ -14,7 +14,7 @@ static const char * const git_interpret_trailers_usage[] = { N_("git interpret-trailers [--in-place] [--trim-empty]\n" - " [(--trailer (|)[(=|:)])...]\n" + " [(--trailer (|)[(=|:)])...]\n" " [--parse] [...]"), NULL };