jamiew/git-friendly — pull request #38 by sapegin (2014-04-03 06:21:57+00:00)
Title: Pop stashed changes on pull error

For example I try to `pull` local branch:

```
❯ git status
On branch test
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)

modified: pull

no changes added to commit (use "git add" and/or "git commit -a")

❯ pull
Fetching from origin ...
fatal: Couldn't find remote ref test

❯ git status
On branch test
nothing to commit, working directory clean
```

Now I have all my uncommitted changes in a stash and a clean tree which isn’t obvious and a bit annoying.