Re: VC mode and git

[Paul Eggert]

On 03/24/2015 08:57 AM, Richard Stallman wrote:
> C-x v v, when it commits changes, should also push them.

Others have mentioned problems with that proposal.  One other thing: I 
guess that the proposal arose from your hassles with a bad ChangeLog 
merge as discussed in the recent "git is screwed" thread. Similar 
hassles have occurred since we switched to git, and we do need something 
better here.  I am planning to implement a different way of addressing 
these hassles, a way that doesn't suffer from the problems that others 
mentioned with altering C-x v v.  The basic idea is that an ordinary 
commit logs their ChangeLog entries only in its commit message, so that 
ordinary commits do not need to alter or merge ChangeLog files.  There 
is a process for generating and fixing up ChangeLogs, which can be done 
only as needed (e.g., just before a release).  For details, please see 
the patch near the end of Bug#19113:

http://bugs.gnu.org/19113#119

This patch works for me, and I plan to convert the Emacs master branch 
to it soon.  I'll send emacs-devel a heads-up warning about it about a 
week before I make the change.  It would be nice if others tested it, as 
everybody has their own habits when dealing with Git and I expect others 
will run into glitches after this is rolled out.  (I hope the glitches 
are smaller than the hassles you've been dealing with....)