Teaching rerere about existing merges

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

Teaching rerere about existing merges

Jeremy Rosen
Hello everybody

I have just discovered rerere which seems to be an awesome feature....

unfortunately I have been merging and resolving conflicts on my repository
for quite some time and I will soon do a rebase that would greatly
gain from using rerere...

is there a way to "teach" rerere about existing merge commits, or do I
have to re-solve all the existing merge manually once ?

    Regards

    Jérémy Rosen

fight key loggers : write some perl using vim
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: Teaching rerere about existing merges

Jed Brown
Jeremy Rosen <[hidden email]> 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 unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: Teaching rerere about existing merges

Jeremy Rosen
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 <[hidden email]> 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 unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: Teaching rerere about existing merges

Junio C Hamano
In reply to this post by Jeremy Rosen
Jeremy Rosen <[hidden email]> 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 tree to do its work, so you should first commit
or stash whatever you are in the middle of doing before using it.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html