diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-09-19 09:47:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-21 10:48:17 -0700 |
| commit | 340f2c5e631c788c0e4a508c21349e04ceed7966 (patch) | |
| tree | c51a9942cbf1867f1066beb33b61d26493d796fc /Documentation/git-merge.txt | |
| parent | ee6ad5f4d56e697c972af86cbefdf269b386e470 (diff) | |
| download | git-340f2c5e631c788c0e4a508c21349e04ceed7966.tar.gz | |
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-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 273a1009be..61d43a712d 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [-s <strategy>] [-X <strategy-option>] [-S[<key-id>]] + [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] 'git merge' <msg> HEAD <commit>... 'git merge' --abort |