Elijah Newren <newren@xxxxxxxxx> writes: > On Fri, Aug 6, 2021 at 6:26 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: >> * en/merge-strategy-docs (2021-08-05) 10 commits >> - Update error message and code comment >> - merge-strategies.txt: add coverage of the `ort` merge strategy >> - git-rebase.txt: correct out-of-date and misleading text about renames >> - merge-strategies.txt: fix simple capitalization error >> - merge-strategies.txt: avoid giving special preference to patience algorithm >> - merge-strategies.txt: do not imply using copy detection is desired >> - merge-strategies.txt: update wording for the resolve strategy >> - Documentation: edit awkward references to `git merge-recursive` >> - directory-rename-detection.txt: small updates due to merge-ort optimizations >> - git-rebase.txt: correct antiquated claims about --rebase-merges >> (this branch is used by en/ort-becomes-the-default.) >> >> Documentation updates. >> >> Expecting a (hopefully final) reroll. > > I'm not sure what you're expecting in another reroll. No one has > commented on my v3 suggesting any issues and I'm not aware of any > remaining things to fix or include. Quite honestly, I do not know where that "expecting" came from X-<. It would have applied to the original one, but I think v3 (which is queued here) should be as ready as it could be.
