From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Bertrand Jacquin" <beber.mailing@gmail.com>
Subject: Re: git faq : draft and rfc
Date: Mon, 20 Feb 2006 14:41:30 +0100
Message-ID: <4fb292fa0602200541x901402fj8a7c60079446ba9d@mail.gmail.com>
References: <22e91bb0602151636r2e70e60cpa5038f4b6caccc9c@mail.gmail.com>
	 <20060216151826.GS31278@pasky.or.cz>
	 <22e91bb0602161552k3f88b98fu4ef2a4c97c840ad7@mail.gmail.com>
	 <4fb292fa0602200530s3e2a2cdag39eec0282187edf3@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:41:53 2006
Return-path: <git-owner@vger.kernel.org>
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 1FBBIG-0005mn-9u
	for gcvg-git@gmane.org; Mon, 20 Feb 2006 14:41:36 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1030217AbWBTNld (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Mon, 20 Feb 2006 08:41:33 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030223AbWBTNld
	(ORCPT <rfc822;git-outgoing>); Mon, 20 Feb 2006 08:41:33 -0500
Received: from nproxy.gmail.com ([64.233.182.193]:1629 "EHLO nproxy.gmail.com")
	by vger.kernel.org with ESMTP id S1030217AbWBTNlc convert rfc822-to-8bit
	(ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 20 Feb 2006 08:41:32 -0500
Received: by nproxy.gmail.com with SMTP id c29so630736nfb
        for <git@vger.kernel.org>; Mon, 20 Feb 2006 05:41:30 -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=R39CA8PcXcPn/i9M3Pbp6VNG3wgL35eVyk2WJB99wy/UgD3q8JtiRlXtVL+9UT4s0tqmYOzbewuWHIWmSucqOzT20MborEyG1VHdcsPBclLZ4gImBBzifV2d9L6kyEEDc9OZB69BY+p3OdTOLgWDbyD8yUxcS/e+47ckXkAYdAM=
Received: by 10.49.21.16 with SMTP id y16mr1227211nfi;
        Mon, 20 Feb 2006 05:41:30 -0800 (PST)
Received: by 10.48.30.15 with HTTP; Mon, 20 Feb 2006 05:41:30 -0800 (PST)
To: "Thomas Riboulet" <riboulet@gmail.com>
In-Reply-To: <4fb292fa0602200530s3e2a2cdag39eec0282187edf3@mail.gmail.com>
Content-Disposition: inline
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/16484>

On 2/20/06, Bertrand Jacquin <beber.mailing@gmail.com> wrote:
> 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 ?

Like as Junio with branch man and html.

>
> I don't know if it's very clear
>
> --
> Beber
> #e.fr@freenode
>


--
Beber
#e.fr@freenode