Merge branch 'lt/logopt' into next

diff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt
index 03a9477664310c2dc5ee9bddc0b34a99b8ab6687..209e36bacb03c166e1c0c61e8c6e14447cd44f6a 100644 (file)
--- a/Documentation/git-mailsplit.txt
+++ b/Documentation/git-mailsplit.txt
@@ -3,11 +3,11 @@ git-mailsplit(1)
 
 NAME
 ----
-git-mailsplit - Totally braindamaged mbox splitter program.
+git-mailsplit - Totally braindamaged mbox splitter program
 
 SYNOPSIS
 --------
-'git-mailsplit' [-d<prec>] [<mbox>] <directory>
+'git-mailsplit' [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>...]
 
 DESCRIPTION
 -----------
@@ -23,11 +23,18 @@ OPTIONS
 <directory>::
        Directory in which to place the individual messages.
 
+-b::
+       If any file doesn't begin with a From line, assume it is a
+       single mail message instead of signalling error.
+
 -d<prec>::
        Instead of the default 4 digits with leading zeros,
        different precision can be specified for the generated
        filenames.
 
+-f<nn>::
+       Skip the first <nn> numbers, for example if -f3 is specified,
+       start the numbering with 0004.
 
 Author
 ------