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.
This commit is contained in:
Paolo Bonzini
2008-07-31 11:00:58 +02:00
parent fdd2c97c0b
commit fee2ed87aa
3 changed files with 26 additions and 0 deletions

View File

@@ -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