Re: GNU-style ChangeLog merge driver for Git

[Jim Meyering]

Bruno Haible <address@hidden> wrote:

> James Youngman wrote:
>> These days, I use a ChangeLog-format change message as my GIT commit
>> message, which solves most of the problem.  It's still not that
>> convenient, sadly, because
>> (1) I have not yet taken the time to wrap Emacs' add-change-log-entry
>> so that it creates a new file for use with git commit -F (instead I
>> just cut the change off the head of ChangeLog and write the extract to
>> ..git/cl-desc)
>
> Wouldn't a wrapper around "git commit" do it? I mean, a program 'vc-commit',
> such that
>
>        vc-commit foo/bar.c bla/blah.c
>
> does the same as
>
>        git commit -m message foo/bar.c bla/blah.c ChangeLog
>
> after having extracted the message from the yet-uncommitted diffs of 
> ChangeLog.
>
> Such a program should be usable by command-line users and by Emacs users,
> right?

That's what "vc-dwim --commit" does (though only from the command line):

  
http://hg.et.redhat.com/hg/emd/applications/vc-dwim?f=97cd8156ef24;file=README;style=raw

You can check out the sources with this:

  hg clone http://hg.et.redhat.com/hg/emd/applications/vc-dwim

Note that the package also includes Ralf Wildenhues' vc-chlog program,
which generates ChangeLog entries from a working directory with diffs
relative to a version control system (any of cvs, hg, git, svn).