git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vincent van Ravesteijn <vfr@lyx.org>
To: git@vger.kernel.org
Subject: Edit a rerere conflict resolution
Date: Mon, 12 Mar 2012 20:14:40 +0100	[thread overview]
Message-ID: <4F5E4B20.5080709@lyx.org> (raw)

Hi all,

Would it be a useful addition to have a command 'git rerere edit <path> 
<commit>' ?

This would allow the user to edit the conflict resolution which was used 
in a certain commit (merge, rebase.. ).

Now I tend to grep in the .git/rr-cache directory, because I don't want 
to do 'git rerere forget' as this would require me to refix more 
resolution than needed.

Vincent

             reply	other threads:[~2012-03-12 19:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-12 19:14 Vincent van Ravesteijn [this message]
2012-03-12 20:01 ` Edit a rerere conflict resolution Junio C Hamano
2012-03-12 20:20   ` Vincent van Ravesteijn
2012-03-12 20:34     ` Junio C Hamano
2012-03-12 21:21       ` Vincent van Ravesteijn
2012-03-12 21:34         ` Junio C Hamano
2012-03-12 21:39           ` Vincent van Ravesteijn
2012-03-12 21:40         ` Jakub Narebski
2012-03-12 21:52           ` Junio C Hamano
2012-03-16 15:54   ` Vincent van Ravesteijn
2012-03-16 16:01     ` Junio C Hamano
2012-03-16 16:14       ` Vincent van Ravesteijn
2012-03-16 16:20         ` Junio C Hamano
2012-03-16 16:37           ` Vincent van Ravesteijn
2012-03-16 16:42           ` Junio C Hamano
2012-03-17 11:03             ` Vincent van Ravesteijn

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=4F5E4B20.5080709@lyx.org \
    --to=vfr@lyx.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 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).