[PATCH] git-cherry-pick.txt: correct a small typo

[PATCH] git-cherry-pick.txt: correct a small typo

[Pablo Santiago Blum de Aguiar]

Most of the document mentions `behavior` instead of the British
variation, `behaviour`. This change makes it consistent.

Signed-off-by: Pablo Santiago Blum de Aguiar <scorphus@gmail.com>
---
 Documentation/git-cherry-pick.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 6154e57..c104a59 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -128,7 +128,7 @@ effect to your index in a row.
 
 --allow-empty-message::
 	By default, cherry-picking a commit with an empty message will fail.
-	This option overrides that behaviour, allowing commits with empty
+	This option overrides that behavior, allowing commits with empty
 	messages to be cherry picked.
 
 --keep-redundant-commits::
-- 
2.8.3

Re: [PATCH] git-cherry-pick.txt: correct a small typo

[Junio C Hamano]

Pablo Santiago Blum de Aguiar <scorphus@gmail.com> writes:

> Most of the document mentions `behavior` instead of the British
> variation, `behaviour`. This change makes it consistent.
>
> Signed-off-by: Pablo Santiago Blum de Aguiar <scorphus@gmail.com>
> ---

Thanks.  This line comes from an ancient 4bee9584 (cherry-pick: add
--allow-empty-message option, 2012-08-02) that happend in v1.8.0
timeframe, and nobody complained for the last 4 years ;-)

We see this in CodingGuidelines:

 The documentation liberally mixes US and UK English (en_US/UK)
 norms for spelling and grammar, which is somewhat unfortunate.
 In an ideal world, it would have been better if it consistently
 used only one and not the other, and we would have picked en_US
 (if you wish to correct the English of some of the existing
 documentation, please see the documentation-related advice in the
 Documentation/SubmittingPatches file).

and the part of SubmittingPatches it refers to is this:

 Speaking of the documentation, it is currently a liberal mixture of US
 and UK English norms for spelling and grammar, which is somewhat
 unfortunate.  A huge patch that touches the files all over the place
 only to correct the inconsistency is not welcome, though.  Potential
 clashes with other changes that can result from such a patch are not
 worth it.  We prefer to gradually reconcile the inconsistencies in
 favor of US English, with small and easily digestible patches, as a
 side effect of doing some other real work in the vicinity (e.g.
 rewriting a paragraph for clarity, while turning en_UK spelling to
 en_US).  Obvious typographical fixes are much more welcomed ("teh ->
 "the"), preferably submitted as independent patches separate from
 other documentation changes.

I wish there were some "other real work in the vicinity" I can use
as an excuse, which would have made it far easier to take this patch;
as I already took a look at it and wrote a response to it, I'll
queue it anyway ;-)

Thanks.




>  Documentation/git-cherry-pick.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
> index 6154e57..c104a59 100644
> --- a/Documentation/git-cherry-pick.txt
> +++ b/Documentation/git-cherry-pick.txt
> @@ -128,7 +128,7 @@ effect to your index in a row.
>  
>  --allow-empty-message::
>  	By default, cherry-picking a commit with an empty message will fail.
> -	This option overrides that behaviour, allowing commits with empty
> +	This option overrides that behavior, allowing commits with empty
>  	messages to be cherry picked.
>  
>  --keep-redundant-commits::