diff options
author | Paolo Bonzini <bonzini@gnu.org> | 2008-07-31 11:00:58 +0200 |
---|---|---|
committer | Paolo Bonzini <bonzini@gnu.org> | 2008-07-31 11:00:58 +0200 |
commit | fee2ed87aa5f0c2a1cefbe4056300e8a28794e39 (patch) | |
tree | 9b04acb3a9d3a7273cce675290b779f40cf035ab | |
parent | fdd2c97c0b6673599d2d1ea030980799a6abbb59 (diff) | |
download | bison-fee2ed87aa5f0c2a1cefbe4056300e8a28794e39.tar.gz |
document and support usage of git-merge-changelog
2008-07-31 Paolo Bonzini <bonzini@gnu.org>
Support usage of git-merge-changelog.
* .gitattributes: New.
* HACKING: Document usage of git-merge-changelog.
* bootstrap: Install git-merge-changelog entries in .git/config
if appropriate.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | HACKING | 4 | ||||
-rwxr-xr-x | bootstrap | 14 |
3 files changed, 26 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2008-07-31 Paolo Bonzini <bonzini@gnu.org> + + Support usage of git-merge-changelog. + * .gitattributes: New. + * HACKING: Document usage of git-merge-changelog. + * bootstrap: Install git-merge-changelog entries in .git/config + if appropriate. + 2008-07-27 Joel E. Denny <jdenny@ces.clemson.edu> Remove remaining dependence on CVS Id keyword. @@ -25,6 +25,10 @@ The correct response to most actual bugs is to write a new test case which demonstrates the bug. Then fix the bug, re-run the test suite, and check everything in. +** You may find it useful to install the git-merge-changelog merge driver. +See http://www.mail-archive.com/bug-gnulib@gnu.org/msg09699.html for +information on how to install it. + * Hacking @@ -267,6 +267,20 @@ cleanup_gnulib() { exit $status } +# See if we can use gnulib's git-merge-changelog merge driver. + +if test -d .git && (git --version) >/dev/null 2>/dev/null ; then + if git config merge.merge-changelog.driver >/dev/null ; then + : + elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then + echo "initializing git-merge-changelog driver" + git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' + git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' + else + echo "consider installing git-merge-changelog from gnulib" + fi +fi + # Get gnulib files. case ${GNULIB_SRCDIR--} in |