uff, am I lucky that I'm not the only one who learned about that just *after* I wouldn't have to had done an intense rebase manually *again*. #hindsightis2020
@nafmo I started using it after reading an article abou5 it a few months ago and I think this should be in every intermediate git course because it resolves the terrible pain of rebasing...
It's great when you resolve conflicts right. But be prepared for perusing the man pages when you record the wrong resolution, and it keeps coming back! 😁
for some reason I keep learning about this setting as if for the first time. I run into a situation where it would help, I fix the problem, I find the setting... then three or four months later I run into the same problem again
Marcus Müller
in reply to daniel:// stenberg:// • • •Gerard Braad
in reply to daniel:// stenberg:// • • •> rerere
stands for "reuse recorded resolution", which might give a better idea of what it does.
Peter Krefting
in reply to daniel:// stenberg:// • • •It's been part of my default #git configuration since 2009. Given the amount of merges and rebases I do at $DAYJOB, I couldn't live without it.
It's one of those things that really ought to be enabled by default.
daniel:// stenberg://
in reply to Peter Krefting • • •Guinness (they/she)
in reply to daniel:// stenberg:// • • •FSMaxB
in reply to daniel:// stenberg:// • • •Jani Nikula
in reply to daniel:// stenberg:// • • •Ben Zanin
in reply to daniel:// stenberg:// • • •Richard Levitte
in reply to daniel:// stenberg:// • • •daniel:// stenberg://
in reply to Richard Levitte • • •Bendodroid :wolfsleeping: :blobhaj_flag_gay:
in reply to daniel:// stenberg:// • • •kablam
in reply to daniel:// stenberg:// • • •steelman
in reply to daniel:// stenberg:// • • •