From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miles Bader Subject: Re: [PATCH] Documentation/merge subtree How-To: fix typo Date: Wed, 09 Feb 2011 18:38:59 +0900 Message-ID: References: <1297242283-11532-1-git-send-email-u.kleine-koenig@pengutronix.de> <20110209090821.GP27982@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= X-From: git-owner@vger.kernel.org Wed Feb 09 10:39:19 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pn6W6-0004AU-6s for gcvg-git-2@lo.gmane.org; Wed, 09 Feb 2011 10:39:18 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367Ab1BIJjN convert rfc822-to-quoted-printable (ORCPT ); Wed, 9 Feb 2011 04:39:13 -0500 Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:40667 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752686Ab1BIJjM convert rfc822-to-8bit (ORCPT ); Wed, 9 Feb 2011 04:39:12 -0500 Received: from mailgate3.nec.co.jp ([10.7.69.160]) by tyo202.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id p199d1e7009407; Wed, 9 Feb 2011 18:39:01 +0900 (JST) Received: (from root@localhost) by mailgate3.nec.co.jp (8.11.7/3.7W-MAILGATE-NEC) id p199d1m01055; Wed, 9 Feb 2011 18:39:01 +0900 (JST) Received: from relay41.aps.necel.com ([10.29.19.9]) by vgate01.nec.co.jp (8.14.4/8.14.4) with ESMTP id p199bKgZ026711; Wed, 9 Feb 2011 18:39:01 +0900 (JST) Received: from relay41.aps.necel.com ([10.29.19.16] [10.29.19.16]) by relay41.aps.necel.com with ESMTP; Wed, 9 Feb 2011 18:39:00 +0900 Received: from dhlpc061 ([10.114.98.26] [10.114.98.26]) by relay41.aps.necel.com with ESMTP; Wed, 9 Feb 2011 18:39:00 +0900 Received: by dhlpc061 (Postfix, from userid 31295) id 4C8C652E1D4; Wed, 9 Feb 2011 18:39:00 +0900 (JST) System-Type: x86_64-unknown-linux-gnu Blat: Foop In-Reply-To: <20110209090821.GP27982@pengutronix.de> ("Uwe =?iso-8859-1?Q?Kleine-K=F6nig=22's?= message of "Wed, 9 Feb 2011 10:08:22 +0100") Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Uwe Kleine-K=F6nig writes: >> - Please note that if the other project merges from you, then it wi= ll >> - 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 w= ant > AFAIK additionally it should be "your's". Should I resend? No, "yours" is correct. -Miles --=20 Erudition, n. Dust shaken out of a book into an empty skull.