* Teaching rerere about existing merges
@ 2013-04-09 14:18 Jeremy Rosen
2013-04-09 15:08 ` Jed Brown
2013-04-09 16:01 ` Junio C Hamano
0 siblings, 2 replies; 4+ messages in thread
From: Jeremy Rosen @ 2013-04-09 14:18 UTC (permalink / raw)
To: Git List
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Teaching rerere about existing merges 2013-04-09 14:18 Teaching rerere about existing merges Jeremy Rosen @ 2013-04-09 15:08 ` Jed Brown 2013-04-09 15:20 ` Jeremy Rosen 2013-04-09 16:01 ` Junio C Hamano 1 sibling, 1 reply; 4+ messages in thread From: Jed Brown @ 2013-04-09 15:08 UTC (permalink / raw) To: Jeremy Rosen, Git List Jeremy Rosen <jeremy.rosen@openwide.fr> 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Teaching rerere about existing merges 2013-04-09 15:08 ` Jed Brown @ 2013-04-09 15:20 ` Jeremy Rosen 0 siblings, 0 replies; 4+ messages in thread From: Jeremy Rosen @ 2013-04-09 15:20 UTC (permalink / raw) To: Jed Brown; +Cc: Git List 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 <jeremy.rosen@openwide.fr> 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 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Teaching rerere about existing merges 2013-04-09 14:18 Teaching rerere about existing merges Jeremy Rosen 2013-04-09 15:08 ` Jed Brown @ 2013-04-09 16:01 ` Junio C Hamano 1 sibling, 0 replies; 4+ messages in thread From: Junio C Hamano @ 2013-04-09 16:01 UTC (permalink / raw) To: Jeremy Rosen; +Cc: Git List Jeremy Rosen <jeremy.rosen@openwide.fr> 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. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-09 16:01 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-04-09 14:18 Teaching rerere about existing merges Jeremy Rosen 2013-04-09 15:08 ` Jed Brown 2013-04-09 15:20 ` Jeremy Rosen 2013-04-09 16:01 ` Junio C Hamano
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).