Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict

[Eli Zaretskii]

> Date: Mon, 20 Apr 2015 16:14:05 +0300
> From: Dmitry Gutov <address@hidden>
> 
> > Or better yet, do the "mark as resolved" differently, which doesn't
> > involved touching the "staging area".  Not sure how to do that, but Git
> > aficionados should be able to find some clever hack for that, involving
> > less than 10 commands.
> 
> Guess I'm not enough of an aficionado, then. After plenty of searching 
> and reading the man pages, 'git add' followed by 'git reset' is the best 
> I have.

AFAIU, "git add" is not needed, "git reset HEAD FILE" is enough.