| commit | c505a850157961d2db4512d029753946d0591649 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Mar 2010 23:32:34 +0000 (10 15:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Mar 2010 23:32:34 +0000 (10 15:32 -0800) | ||
| tree | 718529011f6b516554933451fad147341c3c3ca6 | treesnapshot (tar.gz zip) |
| parent | e25ccff14071ec3628153992acc82b9922e16938 | commitdiff |
| parent | 6d8d8e0de3ca753cd482012d3695602e36356145 | commitdiff |
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
* 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
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| Documentation/git-am.txt | diff1 | diff2 | blobhistory |
| builtin/mailsplit.c | diff1 | diff2 | blobhistory |
| git-am.sh | diff1 | diff2 | blobhistory |