Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate `git rebase --preserve-merges` #158

Closed
wants to merge 1 commit into from

Conversation

Projects
None yet
1 participant
@dscho
Copy link

commented Mar 6, 2019

It had a good run, but its design was irreparably limited. So I came up with a redesign: --rebase-merges. It seems to work all right, so now it is time to start letting go of the previous design.

Changes since v1:

  • The term --rebase-merges is now marked as such in the deprecation notice in git rebase's manual.
  • The deprecation warning is now printed only in builtin/rebase.c, not repeated in git-rebase--preserve-merges.sh.

@dscho dscho force-pushed the dscho:deprecate-rebase-p branch 2 times, most recently from 7f25e31 to 6407430 Mar 6, 2019

@dscho

This comment has been minimized.

Copy link
Author

commented Mar 7, 2019

/submit

@gitgitgadget

This comment has been minimized.

Copy link

commented Mar 7, 2019

@dscho dscho force-pushed the dscho:deprecate-rebase-p branch from 6407430 to 9acb1dc Mar 11, 2019

rebase: deprecate --preserve-merges
We have something much better now: --rebase-merges (which is a
complete re-design --preserve-merges, with a lot of issues fixed such as
the inability to reorder commits with --preserve-merges).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

@dscho dscho force-pushed the dscho:deprecate-rebase-p branch from 9acb1dc to f6990f2 Mar 11, 2019

@dscho

This comment has been minimized.

Copy link
Author

commented Mar 11, 2019

/submit

@gitgitgadget

This comment has been minimized.

Copy link

commented Mar 11, 2019

@gitgitgadget

This comment has been minimized.

Copy link

commented Apr 12, 2019

This branch is now known as js/rebase-deprecate-preserve-merges.

@gitgitgadget

This comment has been minimized.

Copy link

commented Apr 12, 2019

This patch series was integrated into pu via git@fa1b86e.

@gitgitgadget

This comment has been minimized.

Copy link

commented Apr 12, 2019

This patch series was integrated into next via git@fa1b86e.

@gitgitgadget

This comment has been minimized.

Copy link

commented Apr 12, 2019

This patch series was integrated into master via git@fa1b86e.

@gitgitgadget

This comment has been minimized.

Copy link

commented Apr 12, 2019

Closed via fa1b86e.

@gitgitgadget gitgitgadget bot closed this Apr 12, 2019

@dscho dscho deleted the dscho:deprecate-rebase-p branch Apr 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.