On 2022-Sep-08, Justin Pryzby wrote: > If the patch were split into separate parts for MERGE and SPLIT, would > the first patch be significantly smaller than the existing patch > (hopefully half as big) ? That would help to review it, even if both > halves were ultimately squished together. (An easy way to do this is to > open up all the files in separate editor instances, trim out the parts > that aren't needed for the first patch, save the files but don't quit > the editors, test compilation and regression tests, then git commit > --amend -a. Then in each editor, "undo" all the trimmed changes, save, > and git commit -a).
An easier (IMO) way to do that is to use "git gui" or even "git add -p", which allow you to selectively add changed lines/hunks to the index. You add a few, commit, then add the rest, commit again. With "git add -p" you can even edit individual hunks in an editor in case you have a mix of both wanted and unwanted in a single hunk (after "s"plitting, of course), which turns out to be easier than it sounds. -- Álvaro Herrera PostgreSQL Developer — https://www.EnterpriseDB.com/ "El sudor es la mejor cura para un pensamiento enfermo" (Bardia)
