* [PATCH] Documentation/merge subtree How-To: fix typo
@ 2011-02-09 9:04 Uwe Kleine-König
2011-02-09 9:08 ` Uwe Kleine-König
2011-02-09 15:58 ` Michael J Gruber
0 siblings, 2 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2011-02-09 9:04 UTC (permalink / raw)
To: git
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.
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation/merge subtree How-To: fix typo
2011-02-09 9:04 [PATCH] Documentation/merge subtree How-To: fix typo Uwe Kleine-König
@ 2011-02-09 9:08 ` Uwe Kleine-König
2011-02-09 9:38 ` Miles Bader
2011-02-09 15:58 ` Michael J Gruber
1 sibling, 1 reply; 4+ messages in thread
From: Uwe Kleine-König @ 2011-02-09 9:08 UTC (permalink / raw)
To: git
On Wed, Feb 09, 2011 at 10:04:43AM +0100, Uwe Kleine-König wrote:
> 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/ |
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation/merge subtree How-To: fix typo
2011-02-09 9:08 ` Uwe Kleine-König
@ 2011-02-09 9:38 ` Miles Bader
0 siblings, 0 replies; 4+ messages in thread
From: Miles Bader @ 2011-02-09 9:38 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: git
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation/merge subtree How-To: fix typo
2011-02-09 9:04 [PATCH] Documentation/merge subtree How-To: fix typo Uwe Kleine-König
2011-02-09 9:08 ` Uwe Kleine-König
@ 2011-02-09 15:58 ` Michael J Gruber
1 sibling, 0 replies; 4+ messages in thread
From: Michael J Gruber @ 2011-02-09 15:58 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: git
Uwe Kleine-König venit, vidit, dixit 09.02.2011 10:04:
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-09 16:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-09 9:04 [PATCH] Documentation/merge subtree How-To: fix typo Uwe Kleine-König
2011-02-09 9:08 ` Uwe Kleine-König
2011-02-09 9:38 ` Miles Bader
2011-02-09 15:58 ` Michael J Gruber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).