diff options
| author |  Nicolas Vigier <boklm@mars-attacks.org> | 2014-02-01 02:18:01 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-03 12:12:34 -0800 |
| commit | 3b4e395f510c0193be06f264ec53271a6baf0414 (patch) | |
| tree | af39cd1b0c8100b91b538c01fc2730e1b3556502 /Documentation/git-am.txt | |
| parent | am: parse options in stuck-long mode (diff) | |
| download | tgif-3b4e395f510c0193be06f264ec53271a6baf0414.tar.xz | |
am: add the --gpg-sign option
Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 54d8461d61..17924d0f3f 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -14,7 +14,7 @@ SYNOPSIS [--ignore-date] [--ignore-space-change | --ignore-whitespace] [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>] [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] - [--[no-]scissors] + [--[no-]scissors] [-S[<keyid>]] [(<mbox> | <Maildir>)...] 'git am' (--continue | --skip | --abort) @@ -119,6 +119,10 @@ default. You can use `--no-utf8` to override this. Skip the current patch. This is only meaningful when restarting an aborted patch. +-S[<keyid>]:: +--gpg-sign[=<keyid>]:: + GPG-sign commits. + --continue:: -r:: --resolved:: |