News for hackers. Stuff that matters.

A comment on Git cherry-pick and revert use 3-way merge. Parent comment

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).

[ Parent | on HN ]
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.
[ Parent | on HN ]