Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/maint-add-ignored-dir' into maint
[gitweb.git]
/
Documentation
/
git-am.txt
diff --git
a/Documentation/git-am.txt
b/Documentation/git-am.txt
index c66c565bbe3d0e25ded50786e5503b749ad72163..23864df8da0694a0daefb81fe629e22a1deb06f1 100644
(file)
--- 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::