From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 20:45:40 +0000 (-0800)
Subject: Merge branch 'mm/am-c-doc'
X-Git-Tag: v2.4.0-rc0~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c;p=thirdparty%2Fgit.git

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

fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c