Merge branch 'dg/subtree-test'

diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 54e4b4a24331045d97d92355b681b675048a5df7..60d76cdddfc75f0c77d5798ac0b1adc6b0e93899 100644 (file)
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -146,7 +146,7 @@ OPTIONS
 OPTIONS FOR add, merge, push, pull
 ----------------------------------
 --squash::
-       This option is only valid for add, merge, push and pull
+       This option is only valid for add, merge, and pull
        commands.
 +
 Instead of merging the entire history from the subtree project, produce