diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-19 14:45:43 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-19 14:45:43 +0900 |
| commit | 9f8468be43df74665bfd9fd925d8ab6fc74f963f (patch) | |
| tree | 0b21244428d8227366c738ee2dfa2a94fe3af808 /git-merge-one-file.sh | |
| parent | Sync with maint (diff) | |
| parent | Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull' (diff) | |
| download | tgif-9f8468be43df74665bfd9fd925d8ab6fc74f963f.tar.xz | |
Merge branch 'wk/merge-options-gpg-sign-doc'
Doc updates.
* wk/merge-options-gpg-sign-doc:
Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions