{"thread":{"id":"35143","subject":"[PATCH] git-merge: document the -S option","startedAt":"2013-10-14T23:41:05Z","lastAt":"2013-10-14T23:41:05Z","messageCount":1,"participants":["Nicolas Vigier"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"228979","messageId":"1381794065-6657-1-git-send-email-boklm@mars-attacks.org","threadId":"35143","inReplyTo":null,"subject":"[PATCH] git-merge: document the -S option","fromName":"Nicolas Vigier","fromEmail":"boklm@mars-attacks.org","sentAt":"2013-10-14T23:41:05Z","receivedAt":"2013-10-14T23:41:05Z","isPatch":true,"sender":{"key":"boklm@mars-attacks.org","avatar":"https://avatars.githubusercontent.com/u/405910?v=4"},"body":"The option to gpg sign a merge commit is available but was not\ndocumented. Use wording from the git-commit(1) manpage.\n\nSigned-off-by: Nicolas Vigier <boklm@mars-attacks.org>\n---\n Documentation/git-merge.txt | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex a74c371..c7915a6 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -10,7 +10,7 @@ SYNOPSIS\n --------\n [verse]\n 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n-\t[-s <strategy>] [-X <strategy-option>]\n+\t[-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n \t[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]\n 'git merge' <msg> HEAD <commit>...\n 'git merge' --abort\n@@ -65,6 +65,10 @@ OPTIONS\n -------\n include::merge-options.txt[]\n \n+-S[<keyid>]::\n+--gpg-sign[=<keyid>]::\n+\tGPG-sign commit.\n+\n -m <msg>::\n \tSet the commit message to be used for the merge commit (in\n \tcase one is created).\n-- \n1.8.4\n"}]}