Use --rebase-merges for rebase instead of the deprecated --preserve-merges #1342
Conversation
This file contains hidden or 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
…erges git rebase --rebase-merges commandline switch was introduced in Git version v2.18.0 (released on 2018-06-21) to replace the --preserve-merges commandline switch to git rebase. Since v2.22.0 the old --preserve-merges is offically deprecated. Replace the deprecated usage of --preserve-merges with the newer --rebase-merges option on all occurences. The decision was made that the git version v2.18.0 as the minimum required version is reasonably old enough to assume that the user has it (or a newer version) installed on his machine. Therefore no version dependend logic on which switch to select was implemented here.
Closed
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.
git rebase --rebase-merges commandline switch was introduced in Git
version v2.18.0 (released on 2018-06-21) to replace the --preserve-merges
commandline switch to git rebase. Since v2.22.0 the old --preserve-merges
is offically deprecated.
Replace the deprecated usage of --preserve-merges with the newer --rebase-merges
option on all occurences.
The decision was made that the git version v2.18.0 as the minimum required version
is reasonably old enough to assume that the user has it (or a newer version)
installed on his machine. Therefore no version dependend logic on which
switch to select was implemented here.