[Kde-scm-interest] Re: Usage of pull rebasing and merges

[Boudewijn Rempt]

On Tuesday 08 February 2011, Oswald Buddenhagen wrote:
> > - just throw away the merge with git reset --hard HEAD~1 and redo it
> >   after git pull-ing. preferably, you should have git rerere enabled,
> >   so you won't have to repeat resolving any possible conflicts.

Excuse my ignorance... But what is "git rerere"?

-- 
Boudewijn Rempt | http://www.valdyas.org, http://www.krita.org