summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-05 06:24:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-05 06:24:25 (GMT)
commit507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d (patch)
treec560c1c650fdc71a911cd7318d614f1441692d23 /Documentation/git-am.txt
parent511da22ecfb325bb693c0877e2a0d35fdba69a90 (diff)
parente8a285e553f8c6c04820a542b2a28816a9d62d3c (diff)
downloadgit-507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d.zip
git-507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d.tar.gz
git-507665e4f4c87fa4ca8fbe8519e9d0cc36a93d3d.tar.bz2
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: Remove extra '-' from git-am(1)
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index c66c565..23864df 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -44,7 +44,7 @@ OPTIONS
Remove everything in body before a scissors line (see
linkgit:git-mailinfo[1]).
----no-scissors::
+--no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]).
-q::