Re: git is screwed

[Eli Zaretskii]

> From: Steinar Bang <address@hidden>
> Date: Thu, 26 Mar 2015 20:02:58 +0100
> 
> > It should kick in automatically when you have conflict markers,
> 
> Um... since when...?  24.4?  Or git master HEAD?

It needs support from the VC backend.  It was working with bzr for a
long time, but vc-git only has that support on master.

> > and also invoke "git add" automatically for every file saved after
> > resolving all of its conflicts.
> 
> Is that configurable?  It sounds like a step I would like to control
> myself.

It's a minor mode, so of course it's configurable: just switch it off.
Or remove its hook from find-file-hook.  (Not that I understand why
would you want to.)