mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sh/am-keep-cr'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-03-10 15:32:34 -08:00
parent e25ccff140 6d8d8e0de3
commit c505a85015
6 changed files with 141 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/mailsplit.c
View File

@ -10,7 +10,7 @@
#include "strbuf.h"
static const char git_mailsplit_usage[] =
"git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [<mbox>|<Maildir>...]";
static int is_from_line(const char *line, int len)
{