Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint-1.6.6' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 5 Mar 2010 06:24:25 +0000
(22:24 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 5 Mar 2010 06:24:25 +0000
(22:24 -0800)
* maint-1.6.6:
Remove extra '-' from git-am(1)
Documentation/git-am.txt
patch
|
blob
|
history
raw
(from parent 1:
511da22
)
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::