fix(git): enforce pull without rebase #3765
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
|
I cannot think about some use case, which could cause trouble. It could go into develop for few days/weeks. @serl Please rebase to develop branch |
|
I think I rebased! ;) |
Ash258
approved these changes
Dec 2, 2019
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.
Hello,
in my global gitconfig, the option
pull.rebaseis set tointeractive.This means that whenever I
git pull, the editor starts up asking me about rebasing my local branch.While this functionality is questionable, it exists, and it means that whenever I try to install something with scoop, the editor pops up twice (update scoop and update the package list).
This is mildly annoying, so I fixed it locally by setting the option on the two repositories to
false, which works.This PR would fix the issue for everyone (included - or maybe limited to :D - myself in the future).