Hi Elijah, On Sat, 22 Jan 2022, Elijah Newren via GitGitGadget wrote: > Note1: Depends on en/remerge-diff (but no need to pick it up; it's still > RFC). For reasons, I will have to backport this on top of v2.33.1 ;-) > == Updates Log == > > Updates since v2 (thanks to Christian, Dscho, Ramsay, and René for > suggestions and comments on v2): > > * Significant changes to output format: > * Flags no longer take a filename for additional output; they write to > stdout instead. > * More information included by default when there are conflicts (no need > to request it with additional flags, instead flags can be used to > suppress it). > * Provide (mode, oid, stage, file) tuples -- i.e. ls-files -u style of > information -- when there are conflicts. Add a flag to only list > conflicted files if that's preferred. > * Much more thorough manual for git-merge-tree.txt > * Renamed option from --real to --write-tree > * Accept an optional --trivial-merge option to get old style merge-tree > behavior > * Allow both --write-tree and --trivial-merge to be omitted since we can > deduce which from number of arguments > * Document exit code when the merge cannot be run (so we can distinguish > other error cases from conflicts) > * testcase cleanups: test_tick, early skip of test when using recursive > backend, variable renames, etc. > * various minor code cleanups > * Add a new --allow-unrelated-histories option (with same meaning as the > one used in git merge) > * Rebased on top of en/remerge-diff to avoid a small conflict I am really happy with the way this patch series is going, and hope to be a lot more active on it in the near future. I've read through the current iteration and left a few suggestions, nothing major. Thank you so much for your outstanding work! Dscho
