diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-06 14:57:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 14:57:56 -0800 |
| commit | d86679fa061e22e33596814630513b6a7b4d4767 (patch) | |
| tree | cbb918dcdfa87f73743c4a3c58597a6e71555d3a /Documentation | |
| parent | 2e7ca2745b7c08815fdbdccf9b410846e079b102 (diff) | |
| parent | afb5de7f8d0dd9207a587f4ee2fa29d7ee8485ea (diff) | |
| download | git-d86679fa061e22e33596814630513b6a7b4d4767.tar.gz git-d86679fa061e22e33596814630513b6a7b4d4767.tar.xz | |
Merge branch 'mm/am-c-doc' into maint
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')
| -rw-r--r-- | Documentation/config.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-am.txt | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index b22a7a7ff..9307c98aa 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1739,6 +1739,13 @@ log.mailmap:: If true, makes linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1] assume `--use-mailmap`. +mailinfo.scissors:: + If true, makes linkgit:git-mailinfo[1] (and therefore + linkgit:git-am[1]) act by default as if the --scissors option + was provided on the command-line. When active, this features + removes everything from the message body before a scissors + line (i.e. consisting mainly of ">8", "8<" and "-"). + mailmap.file:: The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index f4eea28dc..0d8ba48f7 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]). |