git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
	Git Mailing List <git@vger.kernel.org>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] RelNotes: fix a couple of typos for the upcoming release
Date: Thu, 11 Nov 2021 10:01:28 -0800	[thread overview]
Message-ID: <CABPp-BETy2=J1jNsS_pPpby7Z1P0Yfp92eekMLRicaA=YCL8tQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqo86qmvnr.fsf@gitster.g>

On Thu, Nov 11, 2021 at 9:51 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >     RelNotes: fix a couple of typos for the upcoming release
>
> Thanks.  Relative to -rc2, here is what I have today, taking these
> typofixes, and a few topics for regression fixes.
>

> + * "git pull --ff-only" and "git pull --rebase --ff-only" should make
> +   it a no-op to attempt pulling from a remote that is behind us, but
> +   instead the command errored out by saying it was impossible to
> +   fast-forward, which may technically be true, but not a useful thing
> +   to diagnose as an error.  This has been corrected.
> +   (merge 361cb52383 jc/fix-pull-ff-only-when-already-up-to-date later to maint).

Is this worth calling out in the release notes?  I thought the
discussion elsewhere on this list pointed out that this bug did not
exist in v2.33 or before after all, but rather that it was a
regression that was new to the v2.34 development cycle.

  reply	other threads:[~2021-11-11 18:01 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-10  6:41 [PATCH] RelNotes: fix a couple of typos for the upcoming release Johannes Schindelin via GitGitGadget
2021-11-11 17:47 ` Junio C Hamano
2021-11-11 18:01   ` Elijah Newren [this message]
2021-11-11 20:07     ` Junio C Hamano
2021-11-11 20:17       ` Elijah Newren
2021-11-11 20:27         ` 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='CABPp-BETy2=J1jNsS_pPpby7Z1P0Yfp92eekMLRicaA=YCL8tQ@mail.gmail.com' \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --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.
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).