Merged repo for protocol headers? Why are they split?
Daniel Stone
daniel at fooishbar.org
Wed Nov 29 14:01:00 UTC 2017
Hi,
On 28 November 2017 at 12:38, Daniel Martin <consume.noise at gmail.com> wrote:
> On 27 November 2017 at 23:18, Peter Hutterer <peter.hutterer at who-t.net> wrote:
>> have you looked at subtree merges? Keeps the repo history for each merged
>> repository and the one from the top-level repository. And it forces you to
>> merge into a directory anyway, so that's a win right there.
>
> Oh? No, didn't knew that before. But, tested it:
> $ git remote add -f randrproto
> git://anongit.freedesktop.org/xorg/proto/randrproto
> $ git subtree add --prefix=randrproto/ randrproto master
>
> The history in the toplevel looks good. But, log -p shows the original
> paths in the commits. Okay, it doesn't rewrite history. I can deal
> with that.
> Though,
> $ git log (--graph) randrproto/randr.h
> just shows one commit from the subtree add.
git log --follow -- randrproto/randr.h
Cheers,
Daniel
More information about the xorg-devel
mailing list