This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: git vs ChangeLog
- From: Petr Baudis <pasky at ucw dot cz>
- To: Roland McGrath <roland at hack dot frob dot com>
- Cc: libc-alpha at sourceware dot org
- Date: Sun, 5 Aug 2012 23:24:19 +0200
- Subject: Re: git vs ChangeLog
- References: <20120726215741.98FDC2C0FE@topped-with-meat.com>
Hi!
On Thu, Jul 26, 2012 at 02:57:41PM -0700, Roland McGrath wrote:
> Mark Wielaard has a handy blog entry describing how to use gnulib's
> git-merge-changelog tool to make 'git rebase' and 'git merge' far
> less annoying when dealing with ChangeLog files:
>
> http://gnu.wildebeest.org/blog/mjw/2012/03/16/automagically-merging-changelog-files-with-mercurial-or-git/
>
> There are surely other such write-ups around, but this is the first
> one I found today (and I don't recall at all where I got the info
> for doing it myself many moons ago). Someone with more round tuits
> (and/or tolerance for wiki-writing) than I have should put the
> details on the glibc wiki, refined to just what matters for our git
> repository. Note that you want not just a "ChangeLog" pattern but
> also a "*/ChangeLog*" to catch nptl/ChangeLog, ports/ChangeLog.foo, etc.
Note that some time ago, I described the merge driver at:
http://sourceware.org/glibc/wiki/GlibcGit#ChangeLogs
I cannot edit the wiki right now, so perhaps someone else will expand
the writeup.
Petr "Pasky" Baudis