thefuck

mirror of https://github.com/nvbn/thefuck.git synced 2025-01-19 04:21:14 +00:00

History

Joseph Frazier 8c62706db4 Fix git stash pop with local changes

When there are local changes to a file, and a git stash is popped that
contains other changes to that same file, git fails as follows:

    $ git stash pop
    error: Your local changes to the following files would be overwritten by merge:
            src/index.js
    Please commit your changes or stash them before you merge.
    Aborting
    $

This change adds a rule that corrects this problem as suggested [here]:

    $ git stash pop
    error: Your local changes to the following files would be overwritten by merge:
            src/index.js
    Please commit your changes or stash them before you merge.
    Aborting
    $ fuck
    git add . && git stash pop && git reset . [enter/↑/↓/ctrl+c]
    Auto-merging src/index.js
    On branch flow
    Changes to be committed:
      (use "git reset HEAD <file>..." to unstage)

            modified:   src/index.js

    Changes not staged for commit:
      (use "git add <file>..." to update what will be committed)
      (use "git checkout -- <file>..." to discard changes in working directory)

            modified:   src/index.js

    Dropped refs/stash@{0} (f94776d484c4278997ac6837a7b138b9b9cdead1)
    Unstaged changes after reset:
    M        src/index.js
    $

[here]: https://stackoverflow.com/questions/15126463/how-do-i-merge-local-modifications-with-a-git-stash-without-an-extra-commit/15126489#15126489

2016-12-11 12:44:04 -05:00

functional

test_zsh.py: use official python images, not ubuntu

2016-10-06 11:15:18 -04:00

rules

Fix git stash pop with local changes

2016-12-11 12:44:04 -05:00

shells

Merge pull request #580 from josephfrazier/bash-command-substitution

2016-11-30 15:49:47 +01:00

specific

#N/A: Add npm_missing_script rule