summaryrefslogtreecommitdiffstats
path: root/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-05 13:39:53 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-05 13:39:53 -0700
commit1eb5609b6b3e2908ee747dfe313c24f17334ce26 (patch)
tree7399ab13ecb59275ff9caa0624441831a5b0f8de /git-am.txt
parent70d664063d4eb347c0d30071e08a40fbf72dcd34 (diff)
downloadgit-htmldocs-1eb5609b6b3e2908ee747dfe313c24f17334ce26.tar.gz
Autogenerated HTML docs for v2.6.1-120-g24a00e
Diffstat (limited to 'git-am.txt')
-rw-r--r--git-am.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt
index dbea6e7ae..452c1feb2 100644
--- a/git-am.txt
+++ b/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::