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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to automatically stash changes before performing `git pull` #59849

Merged
merged 1 commit into from Jan 4, 2019

Conversation

Projects
None yet
2 participants
@vladimir-kotikov
Copy link
Contributor

vladimir-kotikov commented Oct 2, 2018

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.autoStash which is false by 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, pullWithRebase and pullFrom methods 馃槈

@joaomoreno joaomoreno added this to the Backlog milestone Oct 3, 2018

@joaomoreno joaomoreno added the git label Oct 3, 2018

@joaomoreno

This comment has been minimized.

Copy link
Member

joaomoreno commented Jan 4, 2019

Thanks! 馃嵒

Ended up refactoring a little bit further.

@joaomoreno joaomoreno merged commit ae2d0cd into Microsoft:master Jan 4, 2019

2 checks passed

VS Code #20181002.88 succeeded with issues
Details
license/cla All CLA requirements met.
Details

@vladimir-kotikov vladimir-kotikov deleted the vladimir-kotikov:15671_autostash_on_pull branch Jan 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment