All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brandon Casey <drafnel@gmail.com>
To: git@vger.kernel.org
Cc: Brandon Casey <drafnel@gmail.com>
Subject: [PATCH 4/4] Documentation/git-commit.txt: correct a few minor grammatical mistakes
Date: Mon, 18 Feb 2013 20:17:07 -0800	[thread overview]
Message-ID: <1361247427-438-4-git-send-email-drafnel@gmail.com> (raw)
In-Reply-To: <1361247427-438-1-git-send-email-drafnel@gmail.com>

Signed-off-by: Brandon Casey <drafnel@gmail.com>
---
 Documentation/git-commit.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0eb79cc..8ae7619 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -174,10 +174,10 @@ OPTIONS
 --cleanup=<mode>::
 	This option sets how the commit message is cleaned up.
 	The  '<mode>' can be one of 'verbatim', 'whitespace', 'strip',
-	and 'default'. The 'default' mode will strip leading and
+	or 'default'. The 'default' mode will strip leading and
 	trailing empty lines and #commentary from the commit message
-	only if the message is to be edited. Otherwise only whitespace
-	removed. The 'verbatim' mode does not change message at all,
+	only if the message is to be edited. Otherwise only whitespace is
+	removed. The 'verbatim' mode does not change the message at all,
 	'whitespace' removes just leading/trailing whitespace lines
 	and 'strip' removes both whitespace and commentary. The default
 	can be changed by the 'commit.cleanup' configuration variable
-- 
1.8.1.3.638.g372f416.dirty

  parent reply	other threads:[~2013-02-19  4:17 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-19  4:17 [PATCH 1/4] t/t7502: compare entire commit message with what was expected Brandon Casey
2013-02-19  4:17 ` [PATCH 2/4] t7502: demonstrate breakage with a commit message with trailing newlines Brandon Casey
2013-02-19  5:39   ` Jonathan Nieder
2013-02-19  4:17 ` [PATCH 3/4] git-commit: only append a newline to -m mesg if necessary Brandon Casey
2013-02-19  6:31   ` Jonathan Nieder
2013-02-19  4:17 ` Brandon Casey [this message]
2013-02-19  6:43   ` [PATCH 4/4] Documentation/git-commit.txt: correct a few minor grammatical mistakes Jonathan Nieder
2013-02-19  7:18     ` Brandon Casey
2013-02-19  7:29       ` Jonathan Nieder
2013-02-19 17:33         ` Junio C Hamano
2013-02-19 18:14           ` [PATCH v2 4/4] Documentation/git-commit.txt: rework the --cleanup section Brandon Casey
2013-02-19 18:28           ` Brandon Casey
2013-02-19 18:29           ` Brandon Casey
2013-02-19 20:28             ` [PATCH] fixup! " Jonathan Nieder
2013-02-19 20:33               ` Brandon Casey
2013-02-19 20:35             ` [PATCH v2 4/4] " Junio C Hamano
2013-02-19  5:08 ` [PATCH 1/4] t/t7502: compare entire commit message with what was expected Jonathan Nieder
2013-02-19  5:10   ` Jonathan Nieder
2013-02-19 17:24   ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1361247427-438-4-git-send-email-drafnel@gmail.com \
    --to=drafnel@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.