Documentation: use 'keyid' consistently, not 'key-id'
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Sep 19, 2015 at 09:47 UTC
340f2c5e631c788c0e4a508c21349e04ceed7966
5 files changed
+17
-17
Documentation/git-cherry-pick.txt
+3
-3
@@ -9,7 +9,7 @@ SYNOPSIS
9
--------
10
[verse]
11
'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
12
- [-S[<key-id>]] <commit>...
12
+ [-S[<keyid>]] <commit>...
13
'git cherry-pick' --continue
14
'git cherry-pick' --quit
15
'git cherry-pick' --abort
@@ -101,8 +101,8 @@ effect to your index in a row.
101
--signoff::
102
Add Signed-off-by line at the end of the commit message.
103
104
--S[<key-id>]::
105
---gpg-sign[=<key-id>]::
104
+-S[<keyid>]::
105
+--gpg-sign[=<keyid>]::
106
GPG-sign commits.
107
108
--ff::
Documentation/git-commit.txt
+1
-1
@@ -13,7 +13,7 @@ SYNOPSIS
13
[-F <file> | -m <msg>] [--reset-author] [--allow-empty]
14
[--allow-empty-message] [--no-verify] [-e] [--author=<author>]
15
[--date=<date>] [--cleanup=<mode>] [--[no-]status]
16
- [-i | -o] [-S[<key-id>]] [--] [<file>...]
16
+ [-i | -o] [-S[<keyid>]] [--] [<file>...]
17
18
DESCRIPTION
19
-----------
Documentation/git-merge.txt
+1
-1
@@ -10,7 +10,7 @@ SYNOPSIS
10
--------
11
[verse]
12
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
13
- [-s <strategy>] [-X <strategy-option>] [-S[<key-id>]]
13
+ [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
14
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
15
'git merge' <msg> HEAD <commit>...
16
'git merge' --abort
Documentation/git-revert.txt
+3
-3
@@ -8,7 +8,7 @@ git-revert - Revert some existing commits
8
SYNOPSIS
9
--------
10
[verse]
11
-'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<key-id>]] <commit>...
11
+'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...
12
'git revert' --continue
13
'git revert' --quit
14
'git revert' --abort
@@ -80,8 +80,8 @@ more details.
80
This is useful when reverting more than one commits'
81
effect to your index in a row.
82
83
--S[<key-id>]::
84
---gpg-sign[=<key-id>]::
83
+-S[<keyid>]::
84
+--gpg-sign[=<keyid>]::
85
GPG-sign commits.
86
87
-s::
Documentation/git-tag.txt
+9
-9
@@ -9,7 +9,7 @@ git-tag - Create, list, delete or verify a tag object signed with GPG
9
SYNOPSIS
10
--------
11
[verse]
12
-'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
12
+'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
13
<tagname> [<commit> | <object>]
14
'git tag' -d <tagname>...
15
'git tag' [-n[<num>]] -l [--contains <commit>] [--points-at <object>]
@@ -24,19 +24,19 @@ to delete, list or verify tags.
24
25
Unless `-f` is given, the named tag must not yet exist.
26
27
-If one of `-a`, `-s`, or `-u <key-id>` is passed, the command
27
+If one of `-a`, `-s`, or `-u <keyid>` is passed, the command
28
creates a 'tag' object, and requires a tag message. Unless
29
`-m <msg>` or `-F <file>` is given, an editor is started for the user to type
30
in the tag message.
31
32
-If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>`
32
+If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <keyid>`
33
are absent, `-a` is implied.
34
35
Otherwise just a tag reference for the SHA-1 object name of the commit object is
36
created (i.e. a lightweight tag).
37
38
A GnuPG signed tag object will be created when `-s` or `-u
39
-<key-id>` is used. When `-u <key-id>` is not used, the
39
+<keyid>` is used. When `-u <keyid>` is not used, the
40
committer identity for the current user is used to find the
41
GnuPG key for signing. The configuration variable `gpg.program`
42
is used to specify custom GnuPG binary.
@@ -63,8 +63,8 @@ OPTIONS
63
--sign::
64
Make a GPG-signed tag, using the default e-mail address's key.
65
66
--u <key-id>::
67
---local-user=<key-id>::
66
+-u <keyid>::
67
+--local-user=<keyid>::
68
Make a GPG-signed tag, using the given key.
69
70
-f::
@@ -125,14 +125,14 @@ This option is only applicable when listing tags without annotation lines.
125
Use the given tag message (instead of prompting).
126
If multiple `-m` options are given, their values are
127
concatenated as separate paragraphs.
128
- Implies `-a` if none of `-a`, `-s`, or `-u <key-id>`
128
+ Implies `-a` if none of `-a`, `-s`, or `-u <keyid>`
129
is given.
130
131
-F <file>::
132
--file=<file>::
133
Take the tag message from the given file. Use '-' to
134
read the message from the standard input.
135
- Implies `-a` if none of `-a`, `-s`, or `-u <key-id>`
135
+ Implies `-a` if none of `-a`, `-s`, or `-u <keyid>`
136
is given.
137
138
--cleanup=<mode>::
@@ -163,7 +163,7 @@ it in the repository configuration as follows:
163
164
-------------------------------------
165
[user]
166
- signingKey = <gpg-key-id>
166
+ signingKey = <gpg-keyid>
167
-------------------------------------
168
169