Merge branch 'tc/commit-abbrev-fix' into maint

diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 207e358ed19cecb8cf7b57d59a9149619909459d..cdfc1b70429dc5d47e42e7aabc9449a585623b0f 100644 (file)
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -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)
 {