From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 0/2] Update the die() preserve-merges messages to help some users
Date: Tue, 22 Feb 2022 10:33:34 +0000 [thread overview]
Message-ID: <pull.1155.git.1645526016.gitgitgadget@gmail.com> (raw)
This small update to the die() preserve-merges messages is a response to the
reported edge case in the Git-for-Windows googlegroups thread
[https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM] where even git
rebase --continue would die.
It is most relevant for Windows because Visual Studio still offers the
option to run git pull --preserve, therefore Git for Windows already applied
these patches. The improvements are not specific to Windows, though, and
should therefore also get into core Git, albeit at a more leisurely pace.
This is a companion patch series to
https://github.com/git-for-windows/git/pull/3708
Philip Oakley (2):
rebase: help user when dying with preserve-merges`
rebase: `preserve` is also a pull option, tell dying users
builtin/rebase.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
base-commit: e6ebfd0e8cbbd10878070c8a356b5ad1b3ca464e
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1155%2Fdscho%2Fdie_preserve-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1155/dscho/die_preserve-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1155
--
gitgitgadget
next reply other threads:[~2022-02-22 10:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 10:33 Johannes Schindelin via GitGitGadget [this message]
2022-02-22 10:33 ` [PATCH 1/2] rebase: help user when dying with preserve-merges` Philip Oakley via GitGitGadget
2022-02-22 15:32 ` Ævar Arnfjörð Bjarmason
2022-02-22 16:06 ` Philip Oakley
2022-02-23 10:20 ` Ævar Arnfjörð Bjarmason
2022-02-23 17:44 ` Philip Oakley
2022-03-08 13:45 ` Ævar Arnfjörð Bjarmason
2022-02-22 10:33 ` [PATCH 2/2] rebase: `preserve` is also a pull option, tell dying users Philip Oakley via GitGitGadget
2022-02-22 15:34 ` Ævar Arnfjörð Bjarmason
2022-02-22 15:56 ` Philip Oakley
2022-02-22 17:48 ` Philip Oakley
2022-02-23 10:27 ` Ævar Arnfjörð Bjarmason
2022-03-04 14:29 ` Philip Oakley
2022-03-07 16:43 ` Johannes Schindelin
2022-03-07 23:26 ` Philip Oakley
2022-03-09 12:18 ` Johannes Schindelin
2022-02-22 18:55 ` [PATCH 0/2] Update the die() preserve-merges messages to help some users Phillip Wood
2022-02-22 20:24 ` Philip Oakley
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.1155.git.1645526016.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/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.