From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Christian Couder" <chriscool@tuxfamily.org>,
"Derrick Stolee" <dstolee@microsoft.com>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Jeff King" <peff@peff.net>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>,
"René Scharfe" <l.s.r@web.de>, "Taylor Blau" <me@ttaylorr.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Elijah Newren" <newren@gmail.com>
Subject: [PATCH 0/2] Switch default merge backend from recursive to ort
Date: Wed, 04 Aug 2021 05:38:00 +0000 [thread overview]
Message-ID: <pull.1011.git.1628055482.gitgitgadget@gmail.com> (raw)
This is a reroll of my RFC series[1] to switch the default merge backend
from recursive to ort. The consensus seems to be that we should do this
immediately after the 2.33 release.
Note that folks who want to get the old merge backend after this series can
simply set pull.twohead=recursive. (And, similarly, before this series,
those who want to try out ort in Git 2.32 or Git 2.33 can set
pull.twohead=ort.)
Changes since the RFC version of this series:
* Now depends on the reroll of en/merge-strategy-docs I just submitted[2].
* Made tweaks to code and documentation suggested by Stolee, Dscho, and
Ævar
[1]
https://lore.kernel.org/git/pull.1055.git.git.1627776461.gitgitgadget@gmail.com/
[2]
https://lore.kernel.org/git/pull.1059.git.git.1628004920.gitgitgadget@gmail.com/
Elijah Newren (2):
Change default merge backend from recursive to ort
Update docs for change of default merge backend
Documentation/git-rebase.txt | 28 ++++-----
Documentation/gitfaq.txt | 2 +-
Documentation/merge-options.txt | 2 +-
Documentation/merge-strategies.txt | 93 ++++++++++++++++--------------
Documentation/user-manual.txt | 2 +-
builtin/merge.c | 10 +++-
builtin/rebase.c | 2 +-
sequencer.c | 4 +-
8 files changed, 78 insertions(+), 65 deletions(-)
base-commit: 4a78ac53424525d7099867d5a4377b8afb9bf18f
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1011%2Fnewren%2Fort-default-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1011/newren/ort-default-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1011
--
gitgitgadget
next reply other threads:[~2021-08-04 5:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 5:38 Elijah Newren via GitGitGadget [this message]
2021-08-04 5:38 ` [PATCH 1/2] Change default merge backend from recursive to ort Elijah Newren via GitGitGadget
2021-08-09 17:38 ` Phillip Wood
2021-08-09 21:01 ` Elijah Newren
2021-08-04 5:38 ` [PATCH 2/2] Update docs for change of default merge backend Elijah Newren via GitGitGadget
2021-08-04 14:26 ` Derrick Stolee
2021-08-04 14:27 ` [PATCH 0/2] Switch default merge backend from recursive to ort Derrick Stolee
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.1011.git.1628055482.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=dstolee@microsoft.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=l.s.r@web.de \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).