# [PATCH] Documentation/merge subtree How-To: fix typo 4 messages from 2011-02-09 to 2011-02-09. Participants: Uwe Kleine-König, Miles Bader, Michael J Gruber. Thread: https://gitlist.dev/t/26451 ## Uwe Kleine-König, 2011-02-09 09:04 Subject: [PATCH] Documentation/merge subtree How-To: fix typo Message-ID: <1297242283-11532-1-git-send-email-u.kleine-koenig@pengutronix.de> URL: https://gitlist.dev/e/1297242283-11532-1-git-send-email-u.kleine-koenig%40pengutronix.de ``` Signed-off-by: Uwe Kleine-König --- Documentation/howto/using-merge-subtree.txt | 2 +- 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. -- 1.7.2.3 ``` ## Uwe Kleine-König, 2011-02-09 09:08 Subject: Re: [PATCH] Documentation/merge subtree How-To: fix typo Message-ID: <20110209090821.GP27982@pengutronix.de> URL: https://gitlist.dev/e/20110209090821.GP27982%40pengutronix.de In-Reply-To: <1297242283-11532-1-git-send-email-u.kleine-koenig@pengutronix.de> ``` On Wed, Feb 09, 2011 at 10:04:43AM +0100, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König > --- > Documentation/howto/using-merge-subtree.txt | 2 +- > 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 AFAIK additionally it should be "your's". Should I resend? Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | ``` ## Miles Bader, 2011-02-09 09:38 Subject: Re: [PATCH] Documentation/merge subtree How-To: fix typo Message-ID: URL: https://gitlist.dev/e/buo39nxbl8s.fsf%40dhlpc061.dev.necel.com In-Reply-To: <20110209090821.GP27982@pengutronix.de> ``` Uwe Kleine-König writes: >> - 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 > AFAIK additionally it should be "your's". Should I resend? No, "yours" is correct. -Miles -- Erudition, n. Dust shaken out of a book into an empty skull. ``` ## Michael J Gruber, 2011-02-09 15:58 Subject: Re: [PATCH] Documentation/merge subtree How-To: fix typo Message-ID: <4D52B98A.2060408@drmicha.warpmail.net> URL: https://gitlist.dev/e/4D52B98A.2060408%40drmicha.warpmail.net In-Reply-To: <1297242283-11532-1-git-send-email-u.kleine-koenig@pengutronix.de> ``` Uwe Kleine-König venit, vidit, dixit 09.02.2011 10:04: > Signed-off-by: Uwe Kleine-König > --- > Documentation/howto/using-merge-subtree.txt | 2 +- > 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. On that occasion you may scrap the final "to". It's either "they don't want" (which I suggest) or "they don't want to do". Michael ```