From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Mar 2010 23:32:34 +0000 (-0800)
Subject: Merge branch 'sh/am-keep-cr'
X-Git-Tag: v1.7.1-rc0~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c505a850157961d2db4512d029753946d0591649;p=git.git

Merge branch 'sh/am-keep-cr'

* sh/am-keep-cr:
  git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr`
  git-am: Add am.keepcr and --no-keep-cr to override it
  git-am: Add command line parameter `--keep-cr` passing it to git-mailsplit
  documentation: 'git-mailsplit --keep-cr' is not hidden anymore
---

c505a850157961d2db4512d029753946d0591649