News for hackers. Stuff that matters.
Re:Git cherry-pick and revert use 3-way merge by twic on Friday November 10, 2023 @02:51PM (#38223647)
I still use Mercurial for personal projects! I do think it's superior to Git in many ways, and simpler than Git in many ways, but now i've got used to Git, i increasingly find myself getting stuck in Mercurial. For example, recently i included changes i didn't want in a commit, and found i had no good way out of the situation, whereas in Git i would just reset the branch to HEAD^ and try again.
Re:Git cherry-pick and revert use 3-way merge by coryrc on Friday November 10, 2023 @03:13PM (#38223918)
hg histedit

edit, commit

hg add <smaller set of files>

hg commit

Possibly hg histedit, then reverse commit order (down commit).

Re:Git cherry-pick and revert use 3-way merge by naasking on Friday November 10, 2023 @03:25PM (#38224039)
Could also strip while keeping changes and then redo the commits.