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

[Thiago Macieira]

Em terça-feira, 8 de fevereiro de 2011, às 12:42:34, Boudewijn Rempt escreveu:
> 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"?

man git-rerere

NAME
       git-rerere - Reuse recorded resolution of conflicted merges


-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20110208/fc4737c3/attachment.sig