From: W. Trevor King Date: Thu, 12 Oct 2017 09:02:17 +0000 (-0700) Subject: Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull' X-Git-Tag: v2.15.0-rc2~4^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/488aa65c8fdad35869d7ac47180ad1688262788f Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull' Pull has supported these since ea230d8 (pull: add the --gpg-sign option, 2014-02-10). Insert in long-option alphabetical order following 7c85d274 (Documentation/merge-options.txt: order options in alphabetical groups, 2009-10-22). Signed-off-by: W. Trevor King Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index f90faf7aaa..1d97a17904 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -64,12 +64,6 @@ OPTIONS ------- include::merge-options.txt[] --S[]:: ---gpg-sign[=]:: - GPG-sign the resulting merge commit. The `keyid` argument is - optional and defaults to the committer identity; if specified, - it must be stuck to the option without a space. - -m :: Set the commit message to be used for the merge commit (in case one is created). diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 5b4a62e936..6d85a76872 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -42,6 +42,12 @@ set to `no` at the beginning of them. current `HEAD` is already up-to-date or the merge can be resolved as a fast-forward. +-S[]:: +--gpg-sign[=]:: + GPG-sign the resulting merge commit. The `keyid` argument is + optional and defaults to the committer identity; if specified, + it must be stuck to the option without a space. + --log[=]:: --no-log:: In addition to branch names, populate the log message with