diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-03 14:38:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-03 14:38:02 -0700 |
| commit | 1df2d6e8dfb36aa82e33777b982a9f5cecffee9b (patch) | |
| tree | 6795349ecb007679fcac4e1de9056cb2495d88d7 /Documentation/git-cherry-pick.txt | |
| parent | 160ef79cec9b3b910e9cf3158964402655b72262 (diff) | |
| parent | cd82b7a0f7217d82dd04fd95f88f0cb3294199f6 (diff) | |
| download | git-1df2d6e8dfb36aa82e33777b982a9f5cecffee9b.tar.gz | |
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/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 2 |
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:: |