From: Alex Riesen <fork0@t-online.de>
Date: Mon, 06 Nov 2006 21:49:01 GMT
Subject: Re: Merge branch to directory of other branch.
Message-ID: <20061106214901.GA25623@steel.home>
In-Reply-To: <1d592d70611061001n6d6f7aa8tbd34a45c5d968eab@mail.gmail.com>

Kirill Shutemov, Mon, Nov 06, 2006 19:01:02 +0100:
> I have one branch with full content and other branch with one
> directory from first branch. How can I merge this branches?

Assuming they are related:

    git checkout -b merged full
    git pull . one-directory