Skip to content

Commit

Permalink
Documentation/git-am.txt: mention mailinfo.scissors config variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthieu Moy authored and Junio C Hamano committed Feb 20, 2015
1 parent d5c4b18 commit afb5de7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Documentation/git-am.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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]).
Expand Down

0 comments on commit afb5de7

Please sign in to comment.