[PATCH 00/10] Documentation updates: merge-strategies · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
[PATCH 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
Re: [PATCH 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges · Johannes Schindelin <hidden> · 2021-08-03
[PATCH 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
[PATCH 03/10] Documentation: edit awkward references to `git merge-recursive` · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
[PATCH 04/10] merge-strategies.txt: update wording for the resolve strategy · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
[PATCH 05/10] merge-strategies.txt: do not imply using copy detection is desired · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
Re: [PATCH 05/10] merge-strategies.txt: do not imply using copy detection is desired · Johannes Schindelin <hidden> · 2021-08-03
[PATCH 07/10] merge-strategies.txt: explain why no-renames might be useful · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
[PATCH 08/10] merge-strategies.txt: fix simple capitalization error · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
Re: [PATCH 08/10] merge-strategies.txt: fix simple capitalization error · Johannes Schindelin <hidden> · 2021-08-03
Re: [PATCH 08/10] merge-strategies.txt: fix simple capitalization error · Elijah Newren <hidden> · 2021-08-03
Re: [PATCH 08/10] merge-strategies.txt: fix simple capitalization error · Johannes Schindelin <hidden> · 2021-08-04
[PATCH 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
Re: [PATCH 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm · Eric Sunshine <hidden> · 2021-08-03
[PATCH 09/10] Documentation: add coverage of the `ort` merge strategy · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
Re: [PATCH 09/10] Documentation: add coverage of the `ort` merge strategy · Johannes Schindelin <hidden> · 2021-08-03
Re: [PATCH 09/10] Documentation: add coverage of the `ort` merge strategy · Elijah Newren <hidden> · 2021-08-03
[PATCH 10/10] Update error message and code comment · Elijah Newren via GitGitGadget <hidden> · 2021-08-03
Re: [PATCH 10/10] Update error message and code comment · Johannes Schindelin <hidden> · 2021-08-03
Re: [PATCH 10/10] Update error message and code comment · Elijah Newren <hidden> · 2021-08-03
Re: [PATCH 00/10] Documentation updates: merge-strategies · Johannes Schindelin <hidden> · 2021-08-03
[PATCH v2 00/10] Documentation updates: merge-strategies · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 03/10] Documentation: edit awkward references to `git merge-recursive` · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 04/10] merge-strategies.txt: update wording for the resolve strategy · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 05/10] merge-strategies.txt: do not imply using copy detection is desired · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 07/10] merge-strategies.txt: fix simple capitalization error · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 08/10] git-rebase.txt: correct out-of-date and misleading text about renames · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
Re: [PATCH v2 08/10] git-rebase.txt: correct out-of-date and misleading text about renames · Ramsay Jones <hidden> · 2021-08-04
Re: [PATCH v2 08/10] git-rebase.txt: correct out-of-date and misleading text about renames · Elijah Newren <hidden> · 2021-08-04
[PATCH v2 09/10] merge-strategies.txt: add coverage of the `ort` merge strategy · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v2 10/10] Update error message and code comment · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
Re: [PATCH v2 00/10] Documentation updates: merge-strategies · Johannes Schindelin <hidden> · 2021-08-04
[PATCH v3 00/10] Documentation updates: merge-strategies · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 01/10] git-rebase.txt: correct antiquated claims about --rebase-merges · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 02/10] directory-rename-detection.txt: small updates due to merge-ort optimizations · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 03/10] Documentation: edit awkward references to `git merge-recursive` · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 04/10] merge-strategies.txt: update wording for the resolve strategy · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 06/10] merge-strategies.txt: avoid giving special preference to patience algorithm · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 05/10] merge-strategies.txt: do not imply using copy detection is desired · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 07/10] merge-strategies.txt: fix simple capitalization error · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 08/10] git-rebase.txt: correct out-of-date and misleading text about renames · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 09/10] merge-strategies.txt: add coverage of the `ort` merge strategy · Elijah Newren via GitGitGadget <hidden> · 2021-08-04
[PATCH v3 10/10] Update error message and code comment · Elijah Newren via GitGitGadget <hidden> · 2021-08-04

Re: [PATCH v2 00/10] Documentation updates: merge-strategies

From: Johannes Schindelin <hidden>
Date: 2021-08-04 21:47:18

Hi Elijah,

On Wed, 4 Aug 2021, Elijah Newren via GitGitGadget wrote:

Range-diff vs v1:
[...]

This looks good to me.

Thank you for making this a very pleasant review,
Dscho

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help