@@ -27,8 +27,8 @@ OPTIONS
2727-------
2828<mbox>|<Maildir>...::
2929 The list of mailbox files to read patches from. If you do not
30- supply this argument, reads from the standard input. If you supply
31- directories, they'll be treated as Maildirs.
30+ supply this argument, the command reads from the standard input.
31+ If you supply directories, they will be treated as Maildirs.
3232
3333-s::
3434--signoff::
@@ -48,7 +48,7 @@ OPTIONS
4848 preferred encoding if it is not UTF-8).
4949+
5050This was optional in prior versions of git, but now it is the
51- default. You could use `--no-utf8` to override this.
51+ default. You can use `--no-utf8` to override this.
5252
5353--no-utf8::
5454 Pass `-n` flag to 'git-mailinfo' (see
@@ -57,8 +57,8 @@ default. You could use `--no-utf8` to override this.
5757-3::
5858--3way::
5959 When the patch does not apply cleanly, fall back on
60- 3-way merge, if the patch records the identity of blobs
61- it is supposed to apply to, and we have those blobs
60+ 3-way merge if the patch records the identity of blobs
61+ it is supposed to apply to and we have those blobs
6262 available locally.
6363
6464--whitespace=<option>::
@@ -121,18 +121,18 @@ the commit, after stripping common prefix "[PATCH <anything>]".
121121It is supposed to describe what the commit is about concisely as
122122a one line text.
123123
124- The body of the message (iow, after a blank line that terminates
125- RFC2822 headers) can begin with "Subject: " and "From: " lines
126- that are different from those of the mail header, to override
127- the values of these fields.
124+ The body of the message (the rest of the message after the blank line
125+ that terminates the RFC2822 headers) can begin with "Subject: " and
126+ "From: " lines that are different from those of the mail header,
127+ to override the values of these fields.
128128
129129The commit message is formed by the title taken from the
130130"Subject: ", a blank line and the body of the message up to
131- where the patch begins. Excess whitespaces at the end of the
131+ where the patch begins. Excess whitespace characters at the end of the
132132lines are automatically stripped.
133133
134134The patch is expected to be inline, directly following the
135- message. Any line that is of form:
135+ message. Any line that is of the form:
136136
137137* three-dashes and end-of-line, or
138138* a line that begins with "diff -", or
@@ -141,18 +141,18 @@ message. Any line that is of form:
141141is taken as the beginning of a patch, and the commit log message
142142is terminated before the first occurrence of such a line.
143143
144- When initially invoking it, you give it names of the mailboxes
145- to crunch . Upon seeing the first patch that does not apply, it
146- aborts in the middle, . You can recover from this in one of two ways:
144+ When initially invoking it, you give it the names of the mailboxes
145+ to process . Upon seeing the first patch that does not apply, it
146+ aborts in the middle. You can recover from this in one of two ways:
147147
148- . skip the current patch by re-running the command with '--skip'
148+ . skip the current patch by re-running the command with the '--skip'
149149 option.
150150
151151. hand resolve the conflict in the working directory, and update
152- the index file to bring it in a state that the patch should
153- have produced. Then run the command with '--resolved' option.
152+ the index file to bring it into a state that the patch should
153+ have produced. Then run the command with the '--resolved' option.
154154
155- The command refuses to process new mailboxes while `.git/rebase-apply`
155+ The command refuses to process new mailboxes while the `.git/rebase-apply`
156156directory exists, so if you decide to start over from scratch,
157157run `rm -f -r .git/rebase-apply` before running the command with mailbox
158158names.
0 commit comments