diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-05 12:45:40 -0800 |
| commit | fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c (patch) | |
| tree | 90b2ff2fabdeb0aaf849c320917468d828ecf5dd /Documentation/git-am.txt | |
| parent | fd9de868c359a1bbd214e354aefdb0f1eaa898bd (diff) | |
| parent | afb5de7f8d0dd9207a587f4ee2fa29d7ee8485ea (diff) | |
| download | git-fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c.tar.gz | |
Merge branch 'mm/am-c-doc'
The configuration variable 'mailinfo.scissors' was hard to
discover in the documentation.
* mm/am-c-doc:
Documentation/git-am.txt: mention mailinfo.scissors config variable
Documentation/config.txt: document mailinfo.scissors
Diffstat (limited to 'Documentation/git-am.txt')
| -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 f4eea28dc4..0d8ba48f79 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]). |