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 9
9
--------
10
10
[verse]
11
11
'git interpret-trailers' [--in-place] [--trim-empty]
12
- [(--trailer (<key>|<keyAlias >)[(=|:)<value>])...]
12
+ [(--trailer (<key>|<key-alias >)[(=|:)<value>])...]
13
13
[--parse] [<file>...]
14
14
15
15
DESCRIPTION
@@ -67,9 +67,9 @@ key: value
67
67
This means that the trimmed <key> and <value> will be separated by
68
68
`': '` (one colon followed by one space).
69
69
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`
71
71
shorter 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
73
73
of the full <key> string, although case sensitivity does not matter. For
74
74
example, if you have
75
75
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.
942
942
`GIT_PROTOCOL`::
943
943
For internal use only. Used in handshaking the wire protocol.
944
944
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
946
946
ignored.
947
947
+
948
948
Note 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.
316
316
With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
317
317
this causes the output to have two extra lines of information
318
318
taken 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),
321
321
depending on a few rules:
322
322
+
323
323
--
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
325
325
format.
326
326
+
327
327
2. If the starting point was specified as `ref@{now}`, show the
Original file line number Diff line number Diff line change 14
14
15
15
static const char * const git_interpret_trailers_usage [] = {
16
16
N_ ("git interpret-trailers [--in-place] [--trim-empty]\n"
17
- " [(--trailer (<key>|<keyAlias >)[(=|:)<value>])...]\n"
17
+ " [(--trailer (<key>|<key-alias >)[(=|:)<value>])...]\n"
18
18
" [--parse] [<file>...]" ),
19
19
NULL
20
20
};
You can’t perform that action at this time.
0 commit comments