Add support for selecting merge or rebase using git config #179
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
geofflamrock
force-pushed
the
support-settings-in-git-config
branch
3 times, most recently
from
bed3d1f to
ae2e2c7
Compare
geofflamrock
force-pushed
the
support-settings-in-git-config
branch
from
ae2e2c7 to
138a845
Compare
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.
This PR is part of a series that add support for using rebase instead of merge
This PR adds support for a git config setting
stack.update.strategyto control whether to use merge or rebase during update/sync. The default value if not set is still merge. A new option--mergehas been added to thesyncandupdatecommands to support specifying merge specifically even if the setting is set to rebase.