Re: merging etc

[David Kastrup]

Leo <address@hidden> writes:

> On 2007-08-24 09:01 +0100, address@hidden wrote:
>> I am motivated to get the mtty functionality into emacs core, even
>> if I wouldn't do the merging this way myself. (I hope the mtty
>> history wont be lost this way, that would really not be very good)
>
> Many people would be grateful for your effort ;)
>
> Maybe this merging difficulty can be avoided in future. I see one
> option for Emacs -- GIT¹.
>
> Footnotes: 
> ¹  http://git.or.cz/

But git will not do the kind of ChangeLog munging that is asked for
here.

On the other hand, git maintains logs and merge history with
author/committer distinction (particularly important for merges).  One
could likely just stop using ChangeLog files at all, or generate them
on-demand (for example, to put into the tarball).

-- 
David Kastrup