From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: What's cooking in git.git (Sep 2021, #01; Thu, 2)
Date: Tue, 07 Sep 2021 12:13:54 +0200 [thread overview]
Message-ID: <87ilzcn0v0.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <xmqq35qmiofp.fsf@gitster.g>
On Thu, Sep 02 2021, Junio C Hamano wrote:
> * js/retire-preserve-merges (2021-09-01) 7 commits
> - tests: stop testing `git rebase --preserve-merges`
> - remote: warn about unhandled branch.<name>.rebase values
> - t5520: do not use `pull.rebase=preserve`
> - rebase: drop the internal `rebase--interactive` command
> - git-svn: drop support for `--preserve-merges`
> - rebase: drop support for `--preserve-merges`
> - pull: remove support for `--rebase=preserve`
>
> The "--preserve-merges" option of "git rebase" has been removed.
>
> Will merge to 'next'?
There's an outstanding re-roll of this topic that hasn't yet hit the
list. If you've got Johannes's git.git on github as a remote:
git range-diff origin/master gitster/js/retire-preserve-merges dscho/drop-rebase-p
I.e. this is in response to some of my comments about now-dead code &
loose ends. Not all of that was addressed, e.g. the git-sh-i18n.sh
change, which is fine & per the discussion there can be done as a
follow-up, but I believe the current state per the above is that
Johannes is still going to submit a (hopefully final) v3.
> * gh/gitweb-branch-sort (2021-06-10) 1 commit
> - gitweb: use HEAD as secondary sort key in git_get_heads_list()
>
> Tie-break branches that point at the same object in the list of
> branches on GitWeb to show the one pointed at by HEAD early.
>
> Waiting for reviews.
I reviewed this & left a note in the last What's Cooking at
<8735qnax0o.fsf@evledraar.gmail.com>. I.e.:
I don't use gitweb anymore, but looked this
(<20210609192806.45406-1-greg@hurrell.net>) over just now. Looks
good to me.
Perhaps it's better if I respond to the patches themselves with such
notes instead of to What's Cooking?
next prev parent reply other threads:[~2021-09-07 10:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-02 22:48 What's cooking in git.git (Sep 2021, #01; Thu, 2) Junio C Hamano
2021-09-03 0:59 ` Philippe Blain
2021-09-03 4:38 ` Junio C Hamano
2021-09-03 2:25 ` Taylor Blau
2021-09-03 4:38 ` Junio C Hamano
2021-09-06 8:55 ` Carlo Arenas
2021-09-06 10:02 ` Ævar Arnfjörð Bjarmason
2021-09-06 21:52 ` Junio C Hamano
2021-09-07 17:39 ` Junio C Hamano
2021-09-06 10:36 ` Han-Wen Nienhuys
2021-09-06 21:55 ` Junio C Hamano
2021-09-06 22:21 ` Ævar Arnfjörð Bjarmason
2021-09-07 10:13 ` Ævar Arnfjörð Bjarmason [this message]
2021-09-07 17:15 ` 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=87ilzcn0v0.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=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).