From: Uwe Kleine-König Date: Wed, 09 Feb 2011 09:08:22 GMT Subject: Re: [PATCH] Documentation/merge subtree How-To: fix typo Message-ID: <20110209090821.GP27982@pengutronix.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/ |