| commit | 5f737ac91bd869e65bff401ad1108581ac504e22 | |
| author | Nicolas Vigier <boklm@mars-attacks.org> | |
| Mon, 14 Oct 2013 23:41:05 +0000 (15 01:41 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Oct 2013 19:47:33 +0000 (18 12:47 -0700) | ||
| tree | 2f78631b9b3c0b314dd43c4b30d0545c7b01c387 | treesnapshot (tar.gz zip) |
| parent | 92ab409055f6f8e379a7a0af731dbad7e1d43af0 | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory |