diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-20 15:45:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-20 15:45:24 +0900 |
| commit | f7e3f4720248d8f301f1a9d734940ac233333bfd (patch) | |
| tree | 9218fcdf9a6a2d6c5ce3604024f3a30ff09d6eb1 /merge-options.txt | |
| parent | badd79c219fe0283e7e2a448cc04da89724eefd9 (diff) | |
| download | git-htmldocs-f7e3f4720248d8f301f1a9d734940ac233333bfd.tar.gz | |
Autogenerated HTML docs for v2.15.0-rc2
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 4e3230430..2552ab8e8 100644 --- a/merge-options.txt +++ b/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[<keyid>]:: +--gpg-sign[=<keyid>]:: + 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[=<n>]:: --no-log:: In addition to branch names, populate the log message with |