[Top][All Lists]

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

Re: merging emacs-24

From: Andreas Schwab
Subject: Re: merging emacs-24
Date: Fri, 28 Nov 2014 09:22:21 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux)

Ted Zlatanov <address@hidden> writes:

> TZ> I used the recommended gnulib driver:
> TZ> [merge "merge-changelog"]
> TZ>         name = GNU-style ChangeLog merge driver
> TZ>         driver = /usr/local/bin/git-merge-changelog %O %A %B
> I'm not sure if this means that `git-merge-changelog' doesn't work the
> way the Emacs maintainers want, or that I used it incorrectly. Hints
> welcome.

You need to add this to .git/info/attributes:

ChangeLog*      merge=merge-changelog


Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

reply via email to

[Prev in Thread] Current Thread [Next in Thread]