Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/git-am.txt: mention mailinfo.scissors config variable
author
Matthieu Moy
<Matthieu.Moy@imag.fr>
Fri, 20 Feb 2015 19:32:21 +0000
(20:32 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 20 Feb 2015 23:09:23 +0000
(15:09 -0800)
It was already documented, but the user had to follow the link to
git-mailinfo.txt to find it.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-am.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d5c4b18
)
diff --git
a/Documentation/git-am.txt
b/Documentation/git-am.txt
index 9adce372ec6e6ec0d371c411da1e5002baea5f51..672a8d38341fa2e6e0b21afa08080f1dd1972673 100644
(file)
--- a/
Documentation/git-am.txt
+++ b/
Documentation/git-am.txt
@@
-52,7
+52,8
@@
OPTIONS
-c::
--scissors::
Remove everything in body before a scissors line (see
- linkgit:git-mailinfo[1]).
+ linkgit:git-mailinfo[1]). Can be activated by default using
+ the `mailinfo.scissors` configuration variable.
--no-scissors::
Ignore scissors lines (see linkgit:git-mailinfo[1]).