-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Jim Meyering on 4/7/2009 6:32 AM: >> If you use Bruno's git-merge-changelog program, and attach a >> .gitattributes notation to your changelog that you do so, then ChangeLog >> diffs have a high probability of applying correctly,
> > Thanks, but does that also help when reordering > change sets via e.g., git rebase -i? Yes. In fact, that was one of the reasons Bruno wrote it. The only time that I've had problems with it is using 'git cherry-pick' across unrelated branches, but that is not something I do as frequently. - -- Don't work too hard, make some time for fun as well! Eric Blake [email protected] -----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 iEYEARECAAYFAknbSQ4ACgkQ84KuGfSFAYCXvwCePVzkbYacAjBhJ1MlbaObaEsx IqwAn3B+WzFegt6yhB9wHDB4CYOQunl5 =En1G -----END PGP SIGNATURE-----
