summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7811d96)
raw | patch | inline | side by side (parent: 7811d96)
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | |
Wed, 9 Feb 2011 09:04:43 +0000 (10:04 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 9 Feb 2011 22:03:51 +0000 (14:03 -0800) |
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/howto/using-merge-subtree.txt | patch | blob | history |
diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt
index 0953a50b693307976977c81a4c0b611fd5dfb490..2933056120bf0a0d6249c6951ab1e964ae40674b 100644 (file)
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.