From: Jeremy Rosen <jeremy.rosen@openwide.fr>
To: Jed Brown <jed@59A2.org>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Teaching rerere about existing merges
Date: Tue, 9 Apr 2013 17:20:01 +0200 (CEST) [thread overview]
Message-ID: <1905484131.1403079.1365520801804.JavaMail.root@openwide.fr> (raw)
In-Reply-To: <87k3ob7ndj.fsf@mcs.anl.gov>
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
>
next prev parent reply other threads:[~2013-04-09 15:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2013-04-09 16:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1905484131.1403079.1365520801804.JavaMail.root@openwide.fr \
--to=jeremy.rosen@openwide.fr \
--cc=git@vger.kernel.org \
--cc=jed@59A2.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).