{"thread":{"id":"26451","subject":"[PATCH] Documentation/merge subtree How-To: fix typo","startedAt":"2011-02-09T09:04:43Z","lastAt":"2011-02-09T15:58:02Z","messageCount":4,"participants":["Uwe Kleine-König","Miles Bader","Michael J Gruber"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"160740","messageId":"1297242283-11532-1-git-send-email-u.kleine-koenig@pengutronix.de","threadId":"26451","inReplyTo":null,"subject":"[PATCH] Documentation/merge subtree How-To: fix typo","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2011-02-09T09:04:43Z","receivedAt":"2011-02-09T09:04:43Z","isPatch":true,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Signed-off-by: Uwe Kleine-König \n---\n Documentation/howto/using-merge-subtree.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt\nindex 0953a50..2933056 100644\n--- a/Documentation/howto/using-merge-subtree.txt\n+++ b/Documentation/howto/using-merge-subtree.txt\n@@ -71,5 +71,5 @@ Additional tips\n relevant parts of your tree.\n \n - Please note that if the other project merges from you, then it will\n- connects its history to yours, which can be something they don't want\n+ connect its history to yours, which can be something they don't want\n to.\n-- \n1.7.2.3\n"},{"id":"160741","messageId":"20110209090821.GP27982@pengutronix.de","threadId":"26451","inReplyTo":"1297242283-11532-1-git-send-email-u.kleine-koenig@pengutronix.de","subject":"Re: [PATCH] Documentation/merge subtree How-To: fix typo","fromName":"Uwe Kleine-König","fromEmail":"u.kleine-koenig@pengutronix.de","sentAt":"2011-02-09T09:08:22Z","receivedAt":"2011-02-09T09:08:22Z","isPatch":true,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"On Wed, Feb 09, 2011 at 10:04:43AM +0100, Uwe Kleine-König wrote:\n> Signed-off-by: Uwe Kleine-König \n> ---\n> Documentation/howto/using-merge-subtree.txt | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt\n> index 0953a50..2933056 100644\n> --- a/Documentation/howto/using-merge-subtree.txt\n> +++ b/Documentation/howto/using-merge-subtree.txt\n> @@ -71,5 +71,5 @@ Additional tips\n> relevant parts of your tree.\n> \n> - Please note that if the other project merges from you, then it will\n> - connects its history to yours, which can be something they don't want\n> + connect its history to yours, which can be something they don't want\nAFAIK additionally it should be \"your's\". Should I resend?\n\nUwe\n\n-- \nPengutronix e.K. | Uwe Kleine-König |\nIndustrial Linux Solutions | http://www.pengutronix.de/ |\n"},{"id":"160743","messageId":"buo39nxbl8s.fsf@dhlpc061.dev.necel.com","threadId":"26451","inReplyTo":"20110209090821.GP27982@pengutronix.de","subject":"Re: [PATCH] Documentation/merge subtree How-To: fix typo","fromName":"Miles Bader","fromEmail":"miles@gnu.org","sentAt":"2011-02-09T09:38:59Z","receivedAt":"2011-02-09T09:38:59Z","isPatch":true,"sender":{"key":"miles@gnu.org","avatar":"https://gravatar.com/avatar/01069b69593af7bff28e2f97afeb3644ae6fe2f5f56cb3a8cf34c5fb8c36efe5?d=mp&s=160"},"body":"Uwe Kleine-König writes:\n>> - Please note that if the other project merges from you, then it will\n>> - connects its history to yours, which can be something they don't want\n>> + connect its history to yours, which can be something they don't want\n> AFAIK additionally it should be \"your's\". Should I resend?\n\nNo, \"yours\" is correct.\n\n-Miles\n\n-- \nErudition, n. Dust shaken out of a book into an empty skull.\n"},{"id":"160769","messageId":"4D52B98A.2060408@drmicha.warpmail.net","threadId":"26451","inReplyTo":"1297242283-11532-1-git-send-email-u.kleine-koenig@pengutronix.de","subject":"Re: [PATCH] Documentation/merge subtree How-To: fix typo","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-02-09T15:58:02Z","receivedAt":"2011-02-09T15:58:02Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Uwe Kleine-König venit, vidit, dixit 09.02.2011 10:04:\n> Signed-off-by: Uwe Kleine-König \n> ---\n> Documentation/howto/using-merge-subtree.txt | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/Documentation/howto/using-merge-subtree.txt b/Documentation/howto/using-merge-subtree.txt\n> index 0953a50..2933056 100644\n> --- a/Documentation/howto/using-merge-subtree.txt\n> +++ b/Documentation/howto/using-merge-subtree.txt\n> @@ -71,5 +71,5 @@ Additional tips\n> relevant parts of your tree.\n> \n> - Please note that if the other project merges from you, then it will\n> - connects its history to yours, which can be something they don't want\n> + connect its history to yours, which can be something they don't want\n> to.\n\nOn that occasion you may scrap the final \"to\". It's either \"they don't\nwant\" (which I suggest) or \"they don't want to do\".\n\nMichael\n"}]}