summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-10 23:32:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-10 23:32:34 (GMT)
commitc505a850157961d2db4512d029753946d0591649 (patch)
tree718529011f6b516554933451fad147341c3c3ca6 /Makefile
parente25ccff14071ec3628153992acc82b9922e16938 (diff)
parent6d8d8e0de3ca753cd482012d3695602e36356145 (diff)
downloadgit-c505a850157961d2db4512d029753946d0591649.zip
git-c505a850157961d2db4512d029753946d0591649.tar.gz
git-c505a850157961d2db4512d029753946d0591649.tar.bz2
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions