diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-09-19 10:47:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-21 20:48:17 +0300 |
| commit | 340f2c5e631c788c0e4a508c21349e04ceed7966 (patch) | |
| tree | c51a9942cbf1867f1066beb33b61d26493d796fc /Documentation/git-cherry-pick.txt | |
| parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
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>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 1147c71da6..66ab29742c 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] - [-S[<key-id>]] <commit>... + [-S[<keyid>]] <commit>... 'git cherry-pick' --continue 'git cherry-pick' --quit 'git cherry-pick' --abort @@ -101,8 +101,8 @@ effect to your index in a row. --signoff:: Add Signed-off-by line at the end of the commit message. --S[<key-id>]:: ---gpg-sign[=<key-id>]:: +-S[<keyid>]:: +--gpg-sign[=<keyid>]:: GPG-sign commits. --ff:: |