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: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Feb 2020, #06; Fri, 28)
Date: Fri, 28 Feb 2020 15:07:08 -0800	[thread overview]
Message-ID: <CABPp-BEJiRyCznkrri-uTqggT60vkvqsU8dAvKz3B1PH6BB6tQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqimjqcoh0.fsf@gitster-ct.c.googlers.com>

On Fri, Feb 28, 2020 at 2:54 PM Junio C Hamano <gitster@pobox.com> wrote:
> * en/merge-path-collision (2020-02-27) 1 commit
>  - merge-recursive: apply collision handling unification to recursive case
>
>  Handling of conflicting renames in merge-recursive have further
>  been made consistent with how existing codepaths try to mimick what
>  is done to add/add conflicts.

s/mimick/mimic/?

> * en/rebase-backend (2020-02-16) 20 commits
>   (merged to 'next' on 2020-02-22 at cae5eb0f18)
>  + rebase: rename the two primary rebase backends
>  + rebase: change the default backend from "am" to "merge"
>  + rebase: make the backend configurable via config setting
>  + rebase tests: repeat some tests using the merge backend instead of am
>  + rebase tests: mark tests specific to the am-backend with --am
>  + rebase: drop '-i' from the reflog for interactive-based rebases
>  + git-prompt: change the prompt for interactive-based rebases
>  + rebase: add an --am option
>  + rebase: move incompatibility checks between backend options a bit earlier
>  + git-rebase.txt: add more details about behavioral differences of backends
>  + rebase: allow more types of rebases to fast-forward
>  + t3432: make these tests work with either am or merge backends
>  + rebase: fix handling of restrict_revision
>  + rebase: make sure to pass along the quiet flag to the sequencer
>  + rebase, sequencer: remove the broken GIT_QUIET handling
>  + t3406: simplify an already simple test
>  + rebase (interactive-backend): fix handling of commits that become empty
>  + rebase (interactive-backend): make --keep-empty the default
>  + t3404: directly test the behavior of interest
>  + git-rebase.txt: update description of --allow-empty-message
>
>  "git rebase" has learned to use the sequencer backend by default,
>  while allowing "--am" option to go back to the traditional "am"
>  backend.

We may need to reword this description due to the last patch in the
series.  Also, the description misses the new rebase.backend
configuration setting.  I'm not the best at wording these release
notes, but something along the lines of:

"git rebase" has learned to use the merge backend by default, while
allowing "--apply" option to go back to the traditional apply backend,
or allowing an alternate default to be set via the new rebase.backend
configuration variable.  This series also renames the backends from
"interactive" (or "sequencer") to "merge" and from "am" to "apply".

  reply	other threads:[~2020-02-28 23:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-28 22:54 What's cooking in git.git (Feb 2020, #06; Fri, 28) Junio C Hamano
2020-02-28 23:07 ` Elijah Newren [this message]
2020-03-02 16:45   ` Junio C Hamano
2020-03-01  1:16 ` Eric Sunshine
2020-03-02 16:47   ` 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-BEJiRyCznkrri-uTqggT60vkvqsU8dAvKz3B1PH6BB6tQ@mail.gmail.com \
    --to=newren@gmail.com \
    --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).