Merge branch 'jk/difftool-in-subdir'

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index c95b715c8cac99f2920fc480654d32b5bf0067d3..d35d771fc8172e12958b4a9521c51a5f65cddebe 100644 (file)
--- 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::