summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2015-09-19 07:47:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-21 17:48:17 (GMT)
commit340f2c5e631c788c0e4a508c21349e04ceed7966 (patch)
treec51a9942cbf1867f1066beb33b61d26493d796fc /Documentation/git-merge.txt
parentee6ad5f4d56e697c972af86cbefdf269b386e470 (diff)
downloadgit-340f2c5e631c788c0e4a508c21349e04ceed7966.zip
git-340f2c5e631c788c0e4a508c21349e04ceed7966.tar.gz
git-340f2c5e631c788c0e4a508c21349e04ceed7966.tar.bz2
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 273a100..61d43a7 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