[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [MirageOS-devel] xen-arm-builder restored



On 22 January 2015 at 11:05, Thomas Gazagnaire <thomas@xxxxxxxxxxxxxx> wrote:
>> Thomas: we need to stream these cron logs to Irmin to make them easier to 
>> aggregate :-)
>
> works in progress is here: https://github.com/samoht/dog

How about using the existing gitattributes(5) syntax for specifying
per-file merge strategies?

https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html#_performing_a_three_way_merge

(is your "set" the same as Git's "union"?)

> would be nice if I can git clone myself sometimes ...

Indeed :-)


-- 
Dr Thomas Leonard        http://0install.net/
GPG: 9242 9807 C985 3C07 44A6  8B9A AE07 8280 59A5 3CC1
GPG: DA98 25AE CAD0 8975 7CDA  BD8E 0713 3F96 CA74 D8BA

_______________________________________________
MirageOS-devel mailing list
MirageOS-devel@xxxxxxxxxxxxxxxxxxxx
http://lists.xenproject.org/cgi-bin/mailman/listinfo/mirageos-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.