summaryrefslogtreecommitdiffstats
path: root/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-14 03:13:27 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-14 03:13:27 +0000
commit46a38aa8be7b8f7b5afdeeea0744859b3e03d5a2 (patch)
tree109cac450de2a01929e22f1db123b486d14a7d25 /git-am.txt
parent208beb7160e9d42ed3938d959525e6d89c642e39 (diff)
downloadgit-htmldocs-46a38aa8be7b8f7b5afdeeea0744859b3e03d5a2.tar.gz
Autogenerated HTML docs for v1.5.6.3-315-g10ce0
Diffstat (limited to 'git-am.txt')
-rw-r--r--git-am.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.txt b/git-am.txt
index 3863eebce..eeb23b25b 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -12,8 +12,8 @@ SYNOPSIS
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
[--3way] [--interactive] [--binary]
[--whitespace=<option>] [-C<n>] [-p<n>]
- <mbox>|<Maildir>...
-'git am' [--skip | --resolved]
+ [<mbox> | <Maildir>...]
+'git am' (--skip | --resolved)
DESCRIPTION
-----------