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

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 23, 2018, 12:11 UTC
Message-ID
<nycvar.QRO.7.76.6.1802231310120.56@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To
<xmqq1shdyidz.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 21 Feb 2018, Junio C Hamano wrote:
Show 18 quoted lines
> * js/rebase-recreate-merge (2018-02-12) 12 commits
>  - rebase -i: introduce --recreate-merges=[no-]rebase-cousins
>  - pull: accept --rebase=recreate to recreate the branch topology
>  - sequencer: handle post-rewrite for merge commands
>  - sequencer: make refs generated by the `label` command worktree-local
>  - rebase: introduce the --recreate-merges option
>  - rebase-helper --make-script: introduce a flag to recreate merges
>  - sequencer: fast-forward merge commits, if possible
>  - sequencer: introduce the `merge` command
>  - sequencer: introduce new commands to reset the revision
>  - git-rebase--interactive: clarify arguments
>  - sequencer: make rearrange_squash() a bit more obvious
>  - sequencer: avoid using errno clobbered by rollback_lock_file()
> 
>  "git rebase" learned "--recreate-merges" to transplant the whole
>  topology of commit graph elsewhere.
> 
>  Is this ready for 'next'?
Not quite. I have two more changes lined up. Let me send v4.

Ciao, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 13 in “What's cooking in git.git (Feb 2018, #03; Wed, 21)”
  1. Junio C HamanoFeb 22, 2018
  2. Brandon WilliamsFeb 22, 2018
  3. Junio C HamanoFeb 22, 2018
  4. Johannes SchindelinFeb 23, 2018
  5. Junio C HamanoFeb 23, 2018
  6. Johannes SchindelinFeb 26, 2018
  7. Junio C HamanoFeb 27, 2018
  8. Phillip WoodFeb 23, 2018
  9. Elijah NewrenFeb 23, 2018
  10. Junio C HamanoFeb 27, 2018
  11. Duy NguyenFeb 26, 2018
  12. Eric SunshineFeb 26, 2018
  13. Jeff HostetlerFeb 27, 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.