From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Mar 2021, #04; Sun, 14)
Date: Mon, 15 Mar 2021 04:43:09 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2103150436260.50@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqq35wx2ccy.fsf@gitster.g>
Hi Junio,
On Sun, 14 Mar 2021, Junio C Hamano wrote:
> Here are the topics that have been cooking. Commits prefixed with '-' are
> only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
> with '+' are in 'next'. The ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
>
> Git 2.31 final is expected to be tagged on Mar 15, 2021 (monday).
Okay, good.
> [...]
>
> --------------------------------------------------
> [Graduated to 'master']
>
> * jn/mergetool-hideresolved-is-optional (2021-03-13) 2 commits
> (merged to 'next' on 2021-03-13 at 23f5a25716)
> + doc: describe mergetool configuration in git-mergetool(1)
> + mergetool: do not enable hideResolved by default
>
> Disable the recent mergetool's hideresolved feature by default for
> backward compatibility and safety.
I do not see this in `master`:
https://github.com/gitster/git/commit/53204061acbf7a03a6ba050f381e0bf9b01e3a78
claims that it is in `jch`, `jn/mergetool-hideresolved-is-optional`,
`next` and `seen`, but not in `master`.
> * tb/pack-revindex-on-disk (2021-02-26) 1 commit
> (merged to 'next' on 2021-03-12 at 7aa348d3b3)
> + pack-revindex.c: don't close unopened file descriptors
>
> Fix for a topic in 'master'.
The same here, I cannot seem to find it in the `master` branch.
Thank you for such a smooth -rc phase. Maybe I'm mistaken, but I found it
very uneventful this time. Which is good ;-)
Ciao,
Dscho
next prev parent reply other threads:[~2021-03-15 12:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 5:51 What's cooking in git.git (Mar 2021, #04; Sun, 14) Junio C Hamano
2021-03-15 3:43 ` Johannes Schindelin [this message]
2021-03-16 1:40 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2103150436260.50@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).