diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-10 15:32:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-10 15:32:34 -0800 |
| commit | c505a850157961d2db4512d029753946d0591649 (patch) | |
| tree | 718529011f6b516554933451fad147341c3c3ca6 /merge-recursive.c | |
| parent | Merge branch 'cp/add-u-pathspec' (diff) | |
| parent | git-am: Add tests for `--keep-cr`, `--no-keep-cr` and `am.keepcr` (diff) | |
| download | tgif-c505a850157961d2db4512d029753946d0591649.tar.xz | |
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 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions