diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 15:07:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 15:07:15 -0800 |
| commit | 5b3533dc1d20a4946b19e379650c2faa5b88c9ec (patch) | |
| tree | 3bc7b2357c9f22023f51c443d7d07fa87aa8fbf3 /git-am.txt | |
| parent | 616a76d3a7e606b4673a9657b203c03a152e7a63 (diff) | |
| download | git-htmldocs-5b3533dc1d20a4946b19e379650c2faa5b88c9ec.tar.gz | |
Autogenerated HTML docs for v1.9.0-138-g2de34
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt index 54d8461d6..17924d0f3 100644 --- a/git-am.txt +++ b/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:: |