PROJET AUTOBLOG


Shaarli - Les discussions de Shaarli

Archivé

Site original : Shaarli - Les discussions de Shaarli

⇐ retour index

Fix conflicts only once with git rerere

mercredi 18 février 2015 à 13:03
CAFAI Liens en Vrac 18/02/2015
rerere is not just a command, but a transverse behavior of Git. For it to be active, you need at least one of two conditions to be met:

   The rerere.enabled configuration setting is set to true
   Your repo contains a rerere database (you have a .git/rr-cache directory)

I can’t quite fathom a situation where having rerere enabled is a bad idea, so I recommend you go ahead and enable it globally:

git config --global rerere.enabled true
(Permalink)