From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/2] Miscellaneous merge fixes
Date: Sun, 21 Aug 2022 04:38:27 +0000 [thread overview]
Message-ID: <pull.1331.git.1661056709.gitgitgadget@gmail.com> (raw)
While working on other things, I noticed a few miscellaneous issues in
builtin/merge.c. Here's a few small fixes to address them.
Elijah Newren (2):
merge: only apply autostash when appropriate
merge: avoid searching for strategies with fewer than 0 conflicts
builtin/merge.c | 19 ++++++++++++++-----
t/t7600-merge.sh | 9 +++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
base-commit: 9bf691b78cf906751e65d65ba0c6ffdcd9a5a12c
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1331%2Fnewren%2Fmisc-merge-fixes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1331/newren/misc-merge-fixes-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1331
--
gitgitgadget
next reply other threads:[~2022-08-21 4:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-21 4:38 Elijah Newren via GitGitGadget [this message]
2022-08-21 4:38 ` [PATCH 1/2] merge: only apply autostash when appropriate Elijah Newren via GitGitGadget
2022-08-21 4:52 ` Eric Sunshine
2022-08-21 5:18 ` Elijah Newren
2022-08-21 4:38 ` [PATCH 2/2] merge: avoid searching for strategies with fewer than 0 conflicts Elijah Newren via GitGitGadget
2022-08-21 18:05 ` Junio C Hamano
2022-08-22 15:00 ` Elijah Newren
2022-08-22 16:19 ` Junio C Hamano
2022-08-23 1:18 ` Elijah Newren
2022-08-23 2:42 ` [PATCH v2 0/3] Miscellaneous merge fixes Elijah Newren via GitGitGadget
2022-08-23 2:42 ` [PATCH v2 1/3] merge: only apply autostash when appropriate Elijah Newren via GitGitGadget
2022-08-23 2:42 ` [PATCH v2 2/3] merge: cleanup confusing logic for handling successful merges Elijah Newren via GitGitGadget
2022-08-23 2:42 ` [PATCH v2 3/3] merge: small code readability improvement Elijah Newren via GitGitGadget
2022-08-23 3:03 ` [PATCH v2 0/3] Miscellaneous merge fixes Elijah Newren
2022-08-24 21:09 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1331.git.1661056709.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.