{"thread":{"id":"18091","subject":"[PATCH 1/3] Documentation: minor grammatical fixes.","startedAt":"2009-03-02T06:37:41Z","lastAt":"2009-03-02T06:37:41Z","messageCount":1,"participants":["David J. Mellor"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"106708","messageId":"20090302163415.563D217A49@sandstone.whistlingcat.com","threadId":"18091","inReplyTo":null,"subject":"[PATCH 1/3] Documentation: minor grammatical fixes.","fromName":"David J. Mellor","fromEmail":"dmellor@whistlingcat.com","sentAt":"2009-03-02T06:37:41Z","receivedAt":"2009-03-02T06:37:41Z","isPatch":true,"sender":{"key":"dmellor@whistlingcat.com","avatar":"https://gravatar.com/avatar/f21761ecb54023bce07527c3841f614f96a4a182b8b3e7cad4d836e4af4ebe9a?d=mp&s=160"},"body":"\nSigned-off-by: David J. Mellor <dmellor@whistlingcat.com>\n---\n Documentation/git-am.txt |   36 ++++++++++++++++++------------------\n 1 files changed, 18 insertions(+), 18 deletions(-)\n\ndiff --git a/Documentation/git-am.txt b/Documentation/git-am.txt\nindex ff307eb..1e71dd5 100644\n--- a/Documentation/git-am.txt\n+++ b/Documentation/git-am.txt\n@@ -27,8 +27,8 @@ OPTIONS\n -------\n <mbox>|<Maildir>...::\n \tThe list of mailbox files to read patches from. If you do not\n-\tsupply this argument, reads from the standard input. If you supply\n-\tdirectories, they'll be treated as Maildirs.\n+\tsupply this argument, the command reads from the standard input.\n+\tIf you supply directories, they will be treated as Maildirs.\n \n -s::\n --signoff::\n@@ -48,7 +48,7 @@ OPTIONS\n \tpreferred encoding if it is not UTF-8).\n +\n This was optional in prior versions of git, but now it is the\n-default.   You could use `--no-utf8` to override this.\n+default.   You can use `--no-utf8` to override this.\n \n --no-utf8::\n \tPass `-n` flag to 'git-mailinfo' (see\n@@ -57,8 +57,8 @@ default.   You could use `--no-utf8` to override this.\n -3::\n --3way::\n \tWhen the patch does not apply cleanly, fall back on\n-\t3-way merge, if the patch records the identity of blobs\n-\tit is supposed to apply to, and we have those blobs\n+\t3-way merge if the patch records the identity of blobs\n+\tit is supposed to apply to and we have those blobs\n \tavailable locally.\n \n --whitespace=<option>::\n@@ -121,18 +121,18 @@ the commit, after stripping common prefix \"[PATCH <anything>]\".\n It is supposed to describe what the commit is about concisely as\n a one line text.\n \n-The body of the message (iow, after a blank line that terminates\n-RFC2822 headers) can begin with \"Subject: \" and \"From: \" lines\n-that are different from those of the mail header, to override\n-the values of these fields.\n+The body of the message (the rest of the message after the blank line\n+that terminates the RFC2822 headers) can begin with \"Subject: \" and\n+\"From: \" lines that are different from those of the mail header,\n+to override the values of these fields.\n \n The commit message is formed by the title taken from the\n \"Subject: \", a blank line and the body of the message up to\n-where the patch begins.  Excess whitespaces at the end of the\n+where the patch begins.  Excess whitespace characters at the end of the\n lines are automatically stripped.\n \n The patch is expected to be inline, directly following the\n-message.  Any line that is of form:\n+message.  Any line that is of the form:\n \n * three-dashes and end-of-line, or\n * a line that begins with \"diff -\", or\n@@ -141,18 +141,18 @@ message.  Any line that is of form:\n is taken as the beginning of a patch, and the commit log message\n is terminated before the first occurrence of such a line.\n \n-When initially invoking it, you give it names of the mailboxes\n-to crunch.  Upon seeing the first patch that does not apply, it\n-aborts in the middle,.  You can recover from this in one of two ways:\n+When initially invoking it, you give it the names of the mailboxes\n+to process.  Upon seeing the first patch that does not apply, it\n+aborts in the middle.  You can recover from this in one of two ways:\n \n-. skip the current patch by re-running the command with '--skip'\n+. skip the current patch by re-running the command with the '--skip'\n   option.\n \n . hand resolve the conflict in the working directory, and update\n-  the index file to bring it in a state that the patch should\n-  have produced.  Then run the command with '--resolved' option.\n+  the index file to bring it into a state that the patch should\n+  have produced.  Then run the command with the '--resolved' option.\n \n-The command refuses to process new mailboxes while `.git/rebase-apply`\n+The command refuses to process new mailboxes while the `.git/rebase-apply`\n directory exists, so if you decide to start over from scratch,\n run `rm -f -r .git/rebase-apply` before running the command with mailbox\n names.\n-- \n1.6.1.3\n"}]}