From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Bertrand Jacquin" Subject: Re: git faq : draft and rfc Date: Mon, 20 Feb 2006 14:30:11 +0100 Message-ID: <4fb292fa0602200530s3e2a2cdag39eec0282187edf3@mail.gmail.com> References: <22e91bb0602151636r2e70e60cpa5038f4b6caccc9c@mail.gmail.com> <20060216151826.GS31278@pasky.or.cz> <22e91bb0602161552k3f88b98fu4ef2a4c97c840ad7@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Feb 20 14:30:45 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FBB7l-0003U6-AC for gcvg-git@gmane.org; Mon, 20 Feb 2006 14:30:45 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030218AbWBTNaP (ORCPT ); Mon, 20 Feb 2006 08:30:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030216AbWBTNaP (ORCPT ); Mon, 20 Feb 2006 08:30:15 -0500 Received: from nproxy.gmail.com ([64.233.182.204]:28703 "EHLO nproxy.gmail.com") by vger.kernel.org with ESMTP id S1030217AbWBTNaN convert rfc822-to-8bit (ORCPT ); Mon, 20 Feb 2006 08:30:13 -0500 Received: by nproxy.gmail.com with SMTP id n15so623973nfc for ; Mon, 20 Feb 2006 05:30:11 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=lTGBlUrSr0twZk+JfPHQXFczdttKVW2DdGkIXrLoDOg0Mb6H6v2xZTvV9brK8on5gXchZup1RXVLH6Y9sGL6cx7qnweMTVKGvvrBvsn5PZYoBCjzhG0oGelfo43R2/39/uQ8lDcP9BPwVxktaO+FT0JTNa0coDbW6n26KjKiib4= Received: by 10.49.68.11 with SMTP id v11mr1234172nfk; Mon, 20 Feb 2006 05:30:11 -0800 (PST) Received: by 10.48.30.15 with HTTP; Mon, 20 Feb 2006 05:30:11 -0800 (PST) To: "Thomas Riboulet" In-Reply-To: <22e91bb0602161552k3f88b98fu4ef2a4c97c840ad7@mail.gmail.com> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Maybe another question : How could I merge a branch 'to-merge' with structure a/b/c into branch 'master' with structure g/h/i and include files from branch 'to-merge' in g/h/i ? I don't know if it's very clear -- Beber #e.fr@freenode