diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2015-02-20 20:32:21 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-02-20 15:09:23 -0800 |
| commit | afb5de7f8d0dd9207a587f4ee2fa29d7ee8485ea (patch) | |
| tree | a031e6f766d379138553eb6f11798906112b5cea | |
| parent | Documentation/config.txt: document mailinfo.scissors (diff) | |
| download | tgif-afb5de7f8d0dd9207a587f4ee2fa29d7ee8485ea.tar.xz | |
Documentation/git-am.txt: mention mailinfo.scissors config variable
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>
| -rw-r--r-- | Documentation/git-am.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 9adce372ec..672a8d3834 100644 --- 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]). |