-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Peter Rosin on 1/9/2009 3:11 AM: > Den 2009-01-09 03:58 skrev Eric Blake: >> Check out Bruno Haible's git-merge-changelog, currently in the gnulib >> repository. It handles rebasing/merging of ChangeLog entries with >> minimal > > I don't have gnulib-tool, which is mentioned in that file, how do I get > hold of that tool (for cygwin)?
Here's how to get a shallow gnulib clone, then build git-merge-changelog: $ git clone --depth=1 git://git.sv.gnu.org/gnulib.git $ gnulib/gnulib-tool --create-testdir --dir=/tmp/testdir123 \ git-merge-changelog $ cd /tmp/testdir123 $ ./configure $ make $ make install (optionally you can check out all of gnulib, by removing --depth) you also have to modify .git/config (or ~/.gitconfig) to install git-merge-changelog as your merge handler for changelogs. > Hmm, is it allowed for ChangeLog entries to not be in chronological > order? Or should I redate them when I rebase? That point is a bit fuzzy; personally, I'm okay with preserving the date that a patch was written, but ordering the changelog in the order patches were applied (so dates are out of order), but rewriting the entries to have the date of the merge is also probably acceptable. - -- Don't work too hard, make some time for fun as well! Eric Blake e...@byu.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAklnT7UACgkQ84KuGfSFAYCSigCeNKGQkS0swWILxvaxBkxi8ncD MnQAoLvZpKHnwFCeTtjjPDWFMtkHiEuD =+iQk -----END PGP SIGNATURE-----
