summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-03 14:38:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-03 14:38:02 -0700
commit1df2d6e8dfb36aa82e33777b982a9f5cecffee9b (patch)
tree6795349ecb007679fcac4e1de9056cb2495d88d7 /Documentation
parentMerge branch 'mr/send-email-doc-gmail-2fa' (diff)
parentgit-cherry-pick.txt: correct a small typo (diff)
downloadtgif-1df2d6e8dfb36aa82e33777b982a9f5cecffee9b.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cherry-pick.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 6154e57238..c104a594af 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::