Add option to automatically stash changes before performing git pull - #59849
Merged
João Moreno (joaomoreno) merged 1 commit intoJan 4, 2019
Merged
Conversation
Contributor
|
Thanks! 🍻 Ended up refactoring a little bit further. |
Vladimir Kotikov (vladimir-kotikov)
deleted the
15671_autostash_on_pull
branch
January 4, 2019 15:20
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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 is an attempt to implement #15671 automatic stashing before pulling any changes (for both 'pull' and 'sync' commands). The behavior is controlled by new
git.autoStashwhich isfalseby default. Stashing is performed only if any tracked files are changed, any changes in untracked/ignored files don't trigger this scenario.Also did a small refactoring to dedupe and reuse some code between
pull,pullWithRebaseandpullFrommethods 😉