Re: Teaching rerere about existing merges

Jeremy Rosen writes: > is there a way to "teach" rerere about existing merge commits, or do I > have to re-solve all the existing merge manually once ? There is a tool that does the "re-solve manually" for you. $ git ls-files | grep rerere-train contrib/rerere-train.sh It uses your working tr

Re: Teaching rerere about existing merges

thanks a lot, that solves my problem. I'm a bit suprised that it's not part of the git-rerere command but that's good enough for me... Cordialement Jérémy Rosen fight key loggers : write some perl using vim - Mail original - > Jeremy Rosen writes: > > > is there a way to "te

Re: Teaching rerere about existing merges

Jeremy Rosen writes: > is there a way to "teach" rerere about existing merge commits, or do I > have to re-solve all the existing merge manually once ? See src/contrib/rerere-train.sh and Junio's blog. http://git-blame.blogspot.com/2012/04/rebuilding-git-integration-environment.html -- To unsu