diff options
| author |  W. Trevor King <wking@tremily.us> | 2017-10-12 11:35:42 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-10-13 10:47:36 +0900 |
| commit | 3a4d2c743750dbc3c8165f362c0a3c0d1c775c8a (patch) | |
| tree | 4d8e47aca3cbe09b993d6013a8f2dac41be8f512 /Documentation/git-remote-helpers.txto | |
| parent | Git 2.15-rc1 (diff) | |
| download | tgif-3a4d2c743750dbc3c8165f362c0a3c0d1c775c8a.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-remote-helpers.txto')
0 files changed, 0 insertions, 0 deletions