All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tristan Roussel <troussel@phare.normalesup.org>
To: git@vger.kernel.org
Subject: Question about rerere
Date: Thu, 6 Nov 2014 12:30:31 +0100	[thread overview]
Message-ID: <F9D7CE90-BED2-4694-B5DB-AE848C9F3F34@phare.normalesup.org> (raw)

Hello,

I’ve just learnt about rerere and it’s going to make my life so much easier, I have a question though.

I enabled rerere very lately and I wanted to know if there was a way to feed rerere with old merge conflict resolutions (and if not, would it be considered a good feature request)? I’d like to do a rebase of my work because I unintentionally merged a branch I didn’t want and the merge is a bit far in the git history and I don’t want to re-resolve merge conflicts I had after that.

Thanks for your help!

             reply	other threads:[~2014-11-06 12:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-06 11:30 Tristan Roussel [this message]
2014-11-06 16:41 ` Question about rerere Christian Neukirchen
2014-11-06 17:03 ` Thomas Adam
2014-11-06 22:29   ` Tristan Roussel

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=F9D7CE90-BED2-4694-B5DB-AE848C9F3F34@phare.normalesup.org \
    --to=troussel@phare.normalesup.org \
    --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.