pull: pass --signoff/--no-signoff to "git merge"
authorW. Trevor King <wking@tremily.us>
Thu, 12 Oct 2017 18:35:42 +0000 (11:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Oct 2017 01:47:36 +0000 (10:47 +0900)
commit3a4d2c743750dbc3c8165f362c0a3c0d1c775c8a
tree4d8e47aca3cbe09b993d6013a8f2dac41be8f512
parent111ef79afe185f8731920569450f6a65320f5d5f
pull: pass --signoff/--no-signoff to "git merge"

merge can take --signoff, but without pull passing --signoff down, it
is inconvenient to use; allow 'pull' to take the option and pass it
through.

The order of options in merge-options.txt is mostly alphabetical by
long option since 7c85d274 (Documentation/merge-options.txt: order
options in alphabetical groups, 2009-10-22).  The long-option bit
didn't make it into the commit message, but it's under the fold in
[1].  I've put --signoff between --log and --stat to preserve the
alphabetical order.

[1]: https://public-inbox.org/git/87iqe7zspn.fsf@jondo.cante.net/

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge.txt
Documentation/merge-options.txt
builtin/pull.c
t/t5521-pull-options.sh