File tree Expand file tree Collapse file tree 4 files changed +8
-8
lines changed
Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 99--------
1010[verse]
1111'git interpret-trailers' [--in-place] [--trim-empty]
12- [(--trailer (<key>|<keyAlias >)[(=|:)<value>])...]
12+ [(--trailer (<key>|<key-alias >)[(=|:)<value>])...]
1313 [--parse] [<file>...]
1414
1515DESCRIPTION
@@ -67,9 +67,9 @@ key: value
6767This means that the trimmed <key> and <value> will be separated by
6868`': '` (one colon followed by one space).
6969
70- For convenience, a <keyAlias > can be configured to make using `--trailer`
70+ For convenience, a <key-alias > can be configured to make using `--trailer`
7171shorter to type on the command line. This can be configured using the
72- 'trailer.<keyAlias >.key' configuration variable. The <keyAlias> must be a prefix
72+ 'trailer.<key-alias >.key' configuration variable. The <keyAlias> must be a prefix
7373of the full <key> string, although case sensitivity does not matter. For
7474example, if you have
7575
Original file line number Diff line number Diff line change @@ -942,7 +942,7 @@ will never be returned from the commit-graph at the cost of performance.
942942`GIT_PROTOCOL`::
943943 For internal use only. Used in handshaking the wire protocol.
944944 Contains a colon ':' separated list of keys with optional values
945- 'key[= value]'. Presence of unknown keys and values must be
945+ '< key>[=< value> ]'. Presence of unknown keys and values must be
946946 ignored.
947947+
948948Note that servers may need to be configured to allow this variable to
Original file line number Diff line number Diff line change @@ -316,12 +316,12 @@ list.
316316With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
317317this causes the output to have two extra lines of information
318318taken from the reflog. The reflog designator in the output may be shown
319- as `ref@{Nth}` (where ` Nth` is the reverse-chronological index in the
320- reflog) or as `ref@{timestamp}` (with the timestamp for that entry),
319+ as `ref@{< Nth> }` (where _< Nth>_ is the reverse-chronological index in the
320+ reflog) or as `ref@{< timestamp> }` (with the _< timestamp>_ for that entry),
321321depending on a few rules:
322322+
323323--
324- 1. If the starting point is specified as `ref@{Nth}`, show the index
324+ 1. If the starting point is specified as `ref@{< Nth> }`, show the index
325325 format.
326326+
3273272. If the starting point was specified as `ref@{now}`, show the
Original file line number Diff line number Diff line change 1414
1515static const char * const git_interpret_trailers_usage [] = {
1616 N_ ("git interpret-trailers [--in-place] [--trim-empty]\n"
17- " [(--trailer (<key>|<keyAlias >)[(=|:)<value>])...]\n"
17+ " [(--trailer (<key>|<key-alias >)[(=|:)<value>])...]\n"
1818 " [--parse] [<file>...]" ),
1919 NULL
2020};
You can’t perform that action at this time.
0 commit comments