tree 2f78631b9b3c0b314dd43c4b30d0545c7b01c387
parent 92ab409055f6f8e379a7a0af731dbad7e1d43af0
author Nicolas Vigier <boklm@mars-attacks.org> 1381794065 +0200
committer Junio C Hamano <gitster@pobox.com> 1382125653 -0700

git-merge: document the -S option

The option to gpg sign a merge commit is available but was not
documented. Use wording from the git-commit(1) manpage.

Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>