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
This commit is contained in:
Junio C Hamano 2016-06-03 14:38:02 -07:00
commit 1df2d6e8df

View file

@ -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::