Edit a rerere conflict resolution

From: Vincent van Ravesteijn <hidden>
Date: 2016-06-15 22:53:17

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help