summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Pablo Santiago Blum de Aguiar <scorphus@gmail.com>2016-05-29 16:29:29 -0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-29 17:32:12 -0700
commitcd82b7a0f7217d82dd04fd95f88f0cb3294199f6 (patch)
treeedbb8266ac9638a1a11c64d70235685155d779b3
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-cd82b7a0f7217d82dd04fd95f88f0cb3294199f6.tar.xz
git-cherry-pick.txt: correct a small typo
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 1c03c792b0..2e2b1436e2 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -125,7 +125,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::