Re: [PATCH v2 0/3] Miscellaneous merge fixes

[PATCH 0/2] Miscellaneous merge fixes · Elijah Newren via GitGitGadget <hidden> · 2022-08-21
[PATCH 2/2] merge: avoid searching for strategies with fewer than 0 conflicts · Elijah Newren via GitGitGadget <hidden> · 2022-08-21
[PATCH 1/2] merge: only apply autostash when appropriate · Elijah Newren via GitGitGadget <hidden> · 2022-08-21
Re: [PATCH 1/2] merge: only apply autostash when appropriate · Eric Sunshine <hidden> · 2022-08-21
Re: [PATCH 1/2] merge: only apply autostash when appropriate · Elijah Newren <hidden> · 2022-08-21
[PATCH v2 0/3] Miscellaneous merge fixes · Elijah Newren via GitGitGadget <hidden> · 2022-08-23
[PATCH v2 1/3] merge: only apply autostash when appropriate · Elijah Newren via GitGitGadget <hidden> · 2022-08-23
[PATCH v2 2/3] merge: cleanup confusing logic for handling successful merges · Elijah Newren via GitGitGadget <hidden> · 2022-08-23
[PATCH v2 3/3] merge: small code readability improvement · Elijah Newren via GitGitGadget <hidden> · 2022-08-23
Re: [PATCH v2 0/3] Miscellaneous merge fixes · Elijah Newren <hidden> · 2022-08-23

From: Elijah Newren <hidden>
Date: 2022-08-23 03:06:02

On Mon, Aug 22, 2022 at 7:42 PM Elijah Newren via GitGitGadget
[off-list ref] wrote:

While working on other things, I noticed a few miscellaneous issues in
builtin/merge.c. Here's a few small fixes to address them.

Sorry, forgot to include a high level summary:

Changes since v1:
  * Fix play/apply typo, spotted by Eric
  * Almost completely rewrote patch 2; it's now merely a "code cleanup"
  * Added a third patch, just a very minor code simplification

`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