From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Jun 2016 21:38:02 +0000 (-0700)
Subject: Merge branch 'pa/cherry-pick-doc-typo'
X-Git-Tag: v2.9.0-rc2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1df2d6e8dfb36aa82e33777b982a9f5cecffee9b?ds=inline;hp=-c

Merge branch 'pa/cherry-pick-doc-typo'

"git cherry-pick --help" had three instances of word "behavior",
one of which was spelled "behaviour", which is updated to match the
other two.

* pa/cherry-pick-doc-typo:
git-cherry-pick.txt: correct a small typo
---

1df2d6e8dfb36aa82e33777b982a9f5cecffee9b
diff --combined Documentation/git-cherry-pick.txt
index 6154e57238,2e2b1436e2..c104a594af
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@@ -9,7 -9,7 +9,7 @@@ SYNOPSI
  --------
  [verse]
  'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
 -		  [-S[<key-id>]] <commit>...
 +		  [-S[<keyid>]] <commit>...
  'git cherry-pick' --continue
  'git cherry-pick' --quit
  'git cherry-pick' --abort
@@@ -100,13 -100,10 +100,13 @@@ effect to your index in a row
  -s::
  --signoff::
  	Add Signed-off-by line at the end of the commit message.
 +	See the signoff option in linkgit:git-commit[1] for more information.
  
 --S[<key-id>]::
 ---gpg-sign[=<key-id>]::
 -	GPG-sign commits.
 +-S[<keyid>]::
 +--gpg-sign[=<keyid>]::
 +	GPG-sign commits. The `keyid` argument is optional and
 +	defaults to the committer identity; if specified, it must be
 +	stuck to the option without a space.
  
  --ff::
  	If the current HEAD is the same as the parent of the
@@@ -128,14 -125,13 +128,14 @@@
  
  --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::
  	If a commit being cherry picked duplicates a commit already in the
  	current history, it will become empty.  By default these
 -	redundant commits are ignored.  This option overrides that behavior and
 +	redundant commits cause `cherry-pick` to stop so the user can
 +	examine the commit. This option overrides that behavior and
  	creates an empty commit object.  Implies `--allow-empty`.
  
  --strategy=<strategy>::