Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'pa/cherry-pick-doc-typo'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 3 Jun 2016 21:38:02 +0000
(14:38 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 3 Jun 2016 21:38:02 +0000
(14:38 -0700)
"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
Documentation/git-cherry-pick.txt
patch
|
blob
|
history
raw
(from parent 1:
160ef79
)
diff --git
a/Documentation/git-cherry-pick.txt
b/Documentation/git-cherry-pick.txt
index 6154e57238143b968b10deacf3ef6fb9d3ef1b86..c104a594afee2dea57db9d9c88b463513558c455 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 behavio
u
r, allowing commits with empty
+ This option overrides that behavior, allowing commits with empty
messages to be cherry picked.
--keep-redundant-commits::