Re: Partial tree export and merging

From: Shawn O. Pearce <spearce@spearce.org>
Date: Sep 24, 2008, 14:39 UTC
Message-ID: <20080924143945.GN3669@spearce.org>
In-Reply-To: <48DA476F.1070700@mahr.de>

Heiko Voigt <heiko.voigt@mahr.de> wrote:

>
> I am currently facing a challenge for adding limited access to a git  
> repository for the i18n and documentation (language) team.

...

Show 10 quoted lines

> To archieve this I would like to extract a repository that only contains  
> the documentation and localization files which can be used by the i8n  
> and doc team. This should be regularly merged into the development (with  
> code) repository.
>
> My idea of a solution would be to export patches only for the specific  
> files and import them into a seperate empty repository/branch using  
> git-format-patch and git-am. This seperate repository then itself then
> could be imported again with a normal merge operation. Has a anyone  
> already solved such a problem or other ideas how to solve this ?

See git-filter-branch. You can use it to slice the history down to only contain these files, but still show the full change history of them (assuming that is what you are trying to get).

Once the history is split into a new "doc+html" repository have developers _only_ edit the docs/html in the doc+html repository, don't make more edits in the source code repository.

You can use git-submodule or git-merge with the subtree strategy to pull changes from the doc+html repository into the main source repository.

-- 
Shawn.