Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(git): enforce pull without rebase #3765

Merged
merged 1 commit into from
Dec 2, 2019
Merged

fix(git): enforce pull without rebase #3765

merged 1 commit into from
Dec 2, 2019

Conversation

serl
Copy link
Contributor

@serl serl commented Nov 22, 2019

Hello,
in my global gitconfig, the option pull.rebase is set to interactive.

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).

@Ash258
Copy link
Contributor

Ash258 commented Dec 2, 2019

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

@serl serl changed the base branch from master to develop December 2, 2019 10:43
@serl
Copy link
Contributor Author

serl commented Dec 2, 2019

I think I rebased! ;)

@r15ch13 r15ch13 changed the title enforce pull without rebase fix(git): enforce pull without rebase Dec 2, 2019
@r15ch13 r15ch13 merged commit 7e32139 into ScoopInstaller:develop Dec 2, 2019
@serl serl deleted the patch-1 branch December 3, 2019 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants