threads / patch / 26451

patchDocumentation/merge subtree How-To: fix typo

Subject: [PATCH] Documentation/merge subtree How-To: fix typo

## tl;dr

4 messages between Feb 9, 2011 and Feb 9, 2011. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Uwe Kleine-König· Feb 9, 2011, 09:04 UTC · lore
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 Documentation/howto/using-merge-subtree.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to Documentation/howto/using-merge-subtree.txt +1 −1
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· Feb 9, 2011, 09:08 UTC · re: Uwe Kleine-König · lore

Re: [PATCH] Documentation/merge subtree How-To: fix typo

On Wed, Feb 09, 2011 at 10:04:43AM +0100, Uwe Kleine-König wrote:
Show 15 quoted lines
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  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· Feb 9, 2011, 09:38 UTC · re: Uwe Kleine-König · lore

Re: [PATCH] Documentation/merge subtree How-To: fix typo

Uwe Kleine-König  <u.kleine-koenig@pengutronix.de> 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· Feb 9, 2011, 15:58 UTC · re: Uwe Kleine-König · lore

Re: [PATCH] Documentation/merge subtree How-To: fix typo

Uwe Kleine-König venit, vidit, dixit 09.02.2011 10:04:
Show 16 quoted lines
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  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

← back to recent threads