summaryrefslogtreecommitdiffstats
path: root/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-08-22 05:10:47 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-08-22 05:10:47 +0000
commitfe24db05d4bb032effbd10c0ef1e4ad11d09c07c (patch)
tree3a575878892ba149206ecb05915d300634fc0828 /git-am.txt
parent0df868a88d19f43e96bbc693a53567a4219ed96b (diff)
downloadgit-htmldocs-fe24db05d4bb032effbd10c0ef1e4ad11d09c07c.tar.gz
Autogenerated HTML docs for v1.6.4.1-174-g32f4c
Diffstat (limited to 'git-am.txt')
-rw-r--r--git-am.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-am.txt b/git-am.txt
index 32e689b2b..fcacc9465 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -11,7 +11,7 @@ SYNOPSIS
[verse]
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--committer-date-is-author-date]
- [--ignore-date]
+ [--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--reject] [-q | --quiet]
[<mbox> | <Maildir>...]
@@ -65,6 +65,9 @@ default. You can use `--no-utf8` to override this.
it is supposed to apply to and we have those blobs
available locally.
+--ignore-date::
+--ignore-space-change::
+--ignore-whitespace::
--whitespace=<option>::
-C<n>::
-p<n>::