Re: git is screwed

[Steinar Bang]

>>>>> Eli Zaretskii <address@hidden>:

>> From: Steinar Bang <address@hidden>

>> > 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.

Ok, it'll be a while until I see it, then.

(Gnus and org comes from git, but my emacs is the newest released
version)

>> 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.)

It's just I like to inspect before I stage.

Force of habit, I guess...

(Another thing is that when I go back to magit it won't have display the
staged file, and it feels like more correct to do 's' to stage the file,
instead of 'g' to refresh magit)

Nothing important in other words.