Re: GNU-style ChangeLog merge driver for Git

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Bruno Haible on 2/11/2008 5:35 AM:
|> The README and installation instructions are in the source code (for now).

First, a big thanks for doing this.  Also, I wonder if this would be worth
pushing upstream for inclusion in git proper.

|
| It turns out that we can put the .gitattributes into the repository: if
someone
| does not have the git-merge-changelog configured, it will have no effect for
| him.

Is there any way to automate the configuration of the "merge-changelog"
merge engine?  In other words, if a project uses the git-merge-changelog
module, could gnulib-tool detect whether both a .git directory and the
'git config' tool are present, and if so, double check that 'git config
- --get merge.merge-changelog.driver' and so forth are defined correctly?

Also, I'm not sure this part of the module specification is wise:

Makefile.am:
bin_PROGRAMS = git-merge-changelog

since that would mean git-merge-changelog is installed alongside every
package that uses the module.  Shouldn't this be a noinst target?

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHsEqL84KuGfSFAYARAsL8AKCwZD0zn6k/nktoBGQ1UIE2evAXyACgqfYh
J6PH71J1ahOZ1f4aEp/sJto=
=7WMO
-----END PGP SIGNATURE-----