From: Junio C Hamano <gitster@pobox.com>
To: Jeremy Rosen <jeremy.rosen@openwide.fr>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Teaching rerere about existing merges
Date: Tue, 09 Apr 2013 09:01:23 -0700 [thread overview]
Message-ID: <7vd2u3u20c.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <504282025.1400346.1365517106800.JavaMail.root@openwide.fr> (Jeremy Rosen's message of "Tue, 9 Apr 2013 16:18:26 +0200 (CEST)")
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.
prev parent reply other threads:[~2013-04-09 16:01 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
2013-04-09 16:01 ` Junio C Hamano [this message]
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=7vd2u3u20c.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jeremy.rosen@openwide.fr \
/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).