summaryrefslogtreecommitdiff
path: root/editor.c
diff options
context:
space:
mode:
authorLibravatar Nicolas Vigier <boklm@mars-attacks.org>2013-10-15 01:41:05 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-18 12:47:33 -0700
commit5f737ac91bd869e65bff401ad1108581ac504e22 (patch)
tree2f78631b9b3c0b314dd43c4b30d0545c7b01c387 /editor.c
parentStart preparing for 1.8.4.2 (diff)
downloadtgif-5f737ac91bd869e65bff401ad1108581ac504e22.tar.xz
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>
Diffstat (limited to 'editor.c')
0 files changed, 0 insertions, 0 deletions