From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Mar 2015 22:57:56 +0000 (-0800)
Subject: Merge branch 'mm/am-c-doc' into maint
X-Git-Tag: v2.3.2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d86679fa061e22e33596814630513b6a7b4d4767;p=thirdparty%2Fgit.git

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
---

d86679fa061e22e33596814630513b6a7b4d4767