mirror of
https://github.com/nvbn/thefuck.git
synced 2025-03-30 07:28:37 +01:00
f4cc88f6c7
This avoids adding untracked files to the repo. See here for a description of the difference between `git add .` and `git add --update`: https://stackoverflow.com/questions/572549/difference-between-git-add-a-and-git-add/572660#572660
19 lines
485 B
Python
19 lines
485 B
Python
from thefuck.shells import shell
|
|
from thefuck.specific.git import git_support
|
|
|
|
|
|
@git_support
|
|
def match(command):
|
|
return ('stash' in command.script
|
|
and 'pop' in command.script
|
|
and 'Your local changes to the following files would be overwritten by merge' in command.stderr)
|
|
|
|
|
|
@git_support
|
|
def get_new_command(command):
|
|
return shell.and_('git add --update', 'git stash pop', 'git reset .')
|
|
|
|
|
|
# make it come before the other applicable rules
|
|
priority = 900
|