On Mon, 5 Aug 2013 20:17:50 +0530, Ramkumar Ramachandra <[email protected]> wrote: > Yeah, and some projects like Emacs still maintain Changelog files (!). > They pollute the history, and pose a very serious pain while > rewriting history/merging, resulting in conflicts that are totally > stupid. [...]
There's a ChangeLog-specific merge driver [1]. No idea if it actually works though... Peace -- Pieter [1] http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c -- --- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
