projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e25ccff 6d8d8e0)
Merge branch 'sh/am-keep-cr'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Mar 2010 23:32:34 +0000 (15:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Mar 2010 23:32:34 +0000 (15:32 -0800)
commitc505a850157961d2db4512d029753946d0591649
tree718529011f6b516554933451fad147341c3c3ca6tree | snapshot
parente25ccff14071ec3628153992acc82b9922e16938commit | diff
parent6d8d8e0de3ca753cd482012d3695602e36356145commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/git-am.txt diff1 | diff2 | blob | history
builtin/mailsplit.c diff1 | diff2 | blob | history
git-am.sh diff1 | diff2 | blob | history
Git—the stupid content tracker