From: Jeremy Rosen <jeremy.rosen@openwide.fr>
To: Git List <git@vger.kernel.org>
Subject: Teaching rerere about existing merges
Date: Tue, 9 Apr 2013 16:18:26 +0200 (CEST) [thread overview]
Message-ID: <504282025.1400346.1365517106800.JavaMail.root@openwide.fr> (raw)
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
next reply other threads:[~2013-04-09 14:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 14:18 Jeremy Rosen [this message]
2013-04-09 15:08 ` Teaching rerere about existing merges Jed Brown
2013-04-09 15:20 ` Jeremy Rosen
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=504282025.1400346.1365517106800.JavaMail.root@openwide.fr \
--to=jeremy.rosen@openwide.fr \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.