git/list[1] front-page[2] threads[3] people[4] search[5] about
 

js/rebase-recreate-merge, was Re: What's cooking in git.git (Apr 2018, #03; Wed, 25)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 25, 2018, 12:37 UTC
Message-ID
<nycvar.QRO.7.76.6.1804251435160.4978@tvgsbejvaqbjf.bet>
In-Reply-To
<xmqqmuxr4r6n.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 25 Apr 2018, Junio C Hamano wrote:
Show 23 quoted lines
> * js/rebase-recreate-merge (2018-04-24) 16 commits
>  - rebase -i --rebase-merges: add a section to the man page
>  - rebase -i: introduce --rebase-merges=[no-]rebase-cousins
>  - pull: accept --rebase=merges to recreate the branch topology
>  - rebase --rebase-merges: avoid "empty merges"
>  - sequencer: handle post-rewrite for merge commands
>  - sequencer: make refs generated by the `label` command worktree-local
>  - rebase --rebase-merges: add test for --keep-empty
>  - rebase: introduce the --rebase-merges option
>  - rebase-helper --make-script: introduce a flag to rebase merges
>  - sequencer: fast-forward `merge` commands, if possible
>  - sequencer: introduce the `merge` command
>  - git-rebase--interactive: clarify arguments
>  - sequencer: offer helpful advice when a command was rescheduled
>  - sequencer: refactor how original todo list lines are accessed
>  - sequencer: make rearrange_squash() a bit more obvious
>  - sequencer: avoid using errno clobbered by rollback_lock_file()
> 
>  "git rebase" learned "--rebase-merges" to transplant the whole
>  topology of commit graph elsewhere.
> 
>  Was on hold.  What's the donness of this thing?
>  cf. <nycvar.QRO.7.76.6.1804210017020.4241@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>

There was enough in limbo that it required a v9, and in hindsight that was a good thing, too, as I prefered to resolve the merge conflicts with Phillip's patch series myself rather than have you do it.

But I hope v9 is good enough for `master`, even if I agree that it would be safer to go through `next`.

This patch series, along with the upcoming `sequencer-and-root-commits` one, is a crucial building block for the two GSoC projects to convert rebase and rebase -i into builtins.

Ciao, Dscho

Previous: Johannes SchindelinNext: Elijah Newren
Message 6 of 12 in “What's cooking in git.git (Apr 2018, #03; Wed, 25)”
  1. Junio C HamanoApr 25, 2018
  2. Ævar Arnfjörð BjarmasonApr 25, 2018
  3. Brandon WilliamsApr 25, 2018
  4. Derrick StoleeApr 26, 2018
  5. Johannes SchindelinApr 27, 2018
  6. js/rebase-recreate-merge, was Re: What's cooking in git.git (Apr 2018, #03; Wed, 25)Johannes Schindelin, Apr 25, 2018
  7. Elijah NewrenApr 25, 2018
  8. Junio C HamanoApr 26, 2018
  9. brian m. carlsonApr 26, 2018
  10. Duy NguyenApr 26, 2018
  11. Eric SunshineApr 27, 2018
  12. Junio C HamanoApr 30, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.