Deprecate git rebase --preserve-merges
#158
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dscho
force-pushed
the
deprecate-rebase-p
branch
2 times, most recently
from
7f25e31
to
6407430
Compare
|
/submit |
|
Submitted as pull.158.git.gitgitgadget@gmail.com |
![gitgitgadget[bot]](https://avatars.githubusercontent.com/in/12836?s=60&v=4){kind=small}
dscho
force-pushed
the
deprecate-rebase-p
branch
from
6407430
to
9acb1dc
Compare
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
force-pushed
the
deprecate-rebase-p
branch
from
9acb1dc
to
f6990f2
Compare
|
/submit |
|
Submitted as pull.158.v2.git.gitgitgadget@gmail.com |
|
This branch is now known as |
|
This patch series was integrated into pu via git@fa1b86e. |
|
This patch series was integrated into next via git@fa1b86e. |
|
This patch series was integrated into master via git@fa1b86e. |
|
Closed via fa1b86e. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
--rebase-mergesis now marked as such in the deprecation notice ingit rebase's manual.git-rebase--preserve-merges.sh.