On 9 Jul 2010, at 00:46, Ralf Wildenhues wrote: > Hi Gary, Hallo Ralf,
> * Gary V. Vaughan wrote on Thu, Jul 08, 2010 at 03:37:23PM CEST: >> commit 8c4dae1232958c24989f31ab5b5768d00be2ef03 >> Author: Gary V. Vaughan <g...@gnu.org> >> Date: Thu Jul 8 18:47:59 2010 +0700 >> >> Fix a spurious trailing space and a botched merge. >> >> * libltdl/m4/libtool.m4 (_LT_PROG_FUNCTION_REPLACE): Remove >> spurious trailing space. >> * ChangeLog: Reorder to match commit order after botched >> merge. > > Make botched ChangeLog merges a thing of the distant, easily forgotten > past by getting to know, installing and configuring git-merge-changelog, > currently distributed as a gnulib module of the same name. Be sure to > use recent git gnulib. It's really that good! I use it already... but screwed things up manually by doing a pull-merge between two commits, and git adding back the merged files without thinking it through properly. So I ended up with the bogus half-merged commit that came before the correction above. D'oh! Using git still feels to me like driving a tank after only having ever practiced with a pea-shooter... ;) Cheers, -- Gary V. Vaughan (g...@gnu.org)
