diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:33 -0700 |
| commit | be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c (patch) | |
| tree | b4280f474cec388974fd48b61f5cac669433a169 /Documentation/git-am.txt | |
| parent | c7997e54a5dd75803657b25aea101255f388ac08 (diff) | |
| parent | 2b594bf90d84fd96f2b1fe904c1e62e391ceb4a0 (diff) | |
| download | git-be4d6f4c7f94541fac1a06e4c04acc2d60de1f8c.tar.gz | |
Merge branch 'mm/keyid-docs' into maint
Very small number of options take a parameter that is optional
(which is not a great UI element as they can only appear at the end
of the command line). Add notice to documentation of each and
every one of them.
* mm/keyid-docs:
Documentation: explain optional arguments better
Documentation/grep: fix documentation of -O
Documentation: use 'keyid' consistently, not 'key-id'
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index dbea6e7ae9..452c1feb23 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -141,7 +141,9 @@ default. You can use `--no-utf8` to override this. -S[<keyid>]:: --gpg-sign[=<keyid>]:: - GPG-sign commits. + GPG-sign commits. The `keyid` argument is optional and + defaults to the committer identity; if specified, it must be + stuck to the option without a space. --continue:: -r:: |