Make pull's rebase parameter a true yes_no_switch
#1832
Merged
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
In case of `pull` it should be possible to trigger a `--no-rebase` by passing in `rebase=False`. Also reading the default from `git config` seems superfluous as omitting the argument will let git find out the default for us. Fix that by making `rebase` a three-state toggle, hence differentiating between a `False` and `None` value.
Rewrite the command to use our `GsWindowCommand` base. While at it, remember the last branch the user has chosen and preselect it the next time.
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.
In case of
pullit should be possible to trigger a--no-rebasebypassing in
rebase=False. Also reading the default fromgit configseems superfluous as omitting the argument will let git find out the
default for us.
Fix that by making
rebasea three-state toggle, hence differentiatingbetween a
FalseandNonevalue.While at it modernize the file.