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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Junio,

On Wed, 21 Feb 2018, Junio C Hamano wrote:

> * 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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux