summaryrefslogtreecommitdiff
path: root/Documentation/howto/using-merge-subtree.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/howto/using-merge-subtree.txt')
-rw-r--r--Documentation/howto/using-merge-subtree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt
index 0953a50b69..2933056120 100644
--- a/Documentation/howto/using-merge-subtree.txt
+++ b/Documentation/howto/using-merge-subtree.txt
@@ -71,5 +71,5 @@ Additional tips
relevant parts of your tree.
- Please note that if the other project merges from you, then it will
- connects its history to yours, which can be something they don't want
+ connect its history to yours, which can be something they don't want
to.