summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-02-09 09:04:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-09 22:03:51 (GMT)
commit59ab4eb36e20b0df9231e736f7d685fb43ad9364 (patch)
treee78954857110003c29ad9acd33c90fdf702fd381 /Documentation/howto
parent7811d9600f02e70c9f835719c71156c967a684f7 (diff)
downloadgit-59ab4eb36e20b0df9231e736f7d685fb43ad9364.zip
git-59ab4eb36e20b0df9231e736f7d685fb43ad9364.tar.gz
git-59ab4eb36e20b0df9231e736f7d685fb43ad9364.tar.bz2
Documentation/merge subtree How-To: fix typo
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto')
-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 0953a50..2933056 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.