This is the mail archive of the
mailing list for the Cygwin project.
Re: [setup] Makefile.am patches
- From: Achim Gratz <Stromeko at nexgo dot de>
- To: cygwin-apps at cygwin dot com
- Date: Mon, 16 Feb 2015 10:52:24 +0100
- Subject: Re: [setup] Makefile.am patches
- Authentication-results: sourceware.org; auth=none
- References: <87k2zkcnxv dot fsf at Rainer dot invalid> <20150215104056 dot GO7225 at calimero dot vinschen dot de> <87a90fxqhn dot fsf at Rainer dot invalid> <20150215143557 dot GU7225 at calimero dot vinschen dot de> <871tlrxhc2 dot fsf at Rainer dot invalid> <20150216091237 dot GV7225 at calimero dot vinschen dot de>
Corinna Vinschen writes:
> I saw some .gitattributes file mentioning exactly this ChangeLog merging
> in the binutils-gdb repo and copied it over so it's part of our repo as
That deals with the problem of merging log files. If you do keep a
manual log just about any merge would create a conflict since you're
always editing the same part of the file.
> I don't know exactly where to go from there. The comment claims the
> user has to install the git-merge-changelog package and per the comment
> "this is the tricky part!". Why that's the tricky part beats me. The
> git-merge-changelog package is part of the Fedora distro.
It is also in openSUSE, but other than that you'd have to install it by
> So, is that really all there is? Installing git-merge-changelog,
> [merge "merge-changelog"]
> name = GNU-style ChangeLog merge driver
> driver = git-merge-changelog %O %A %B
> to my .gitconfig and shoot? So ultimately the user has to make the choice
> whether generating ChangeLogs automatically or manually, right?
Yes, you now have a merge driver for ChangeLog files and Git can use it
instead of the simple merge it would use otherwise.
>> For starters it only needs to trace back to the latest tag and not
>> through all commits and the tags give you an easy way to refer to
>> exactly the commit some release has been made from.
> Ok, I trust you tested it? Please check in (with ChangeLog ;))
This is Git, so if you want to give it a spin, please add this as an
additional remote: http://repo.or.cz/w/cygwin-setup/local.git, then pull
from my "local" branch.
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2: