git pull: stash is needed if there is anything in the staging area.
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 23 Mar 2011 09:34:45 +0000 (12:34 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 23 Mar 2011 09:34:45 +0000 (12:34 +0300)
commit29181dec3bfda61a03019f568c037e0518b15651
tree1468bbbdca732f3c51f33af35d70534e15c68f8a
parent2ba4b72b35171932088ad0fdab1d31afa5e87add
git pull: stash is needed if there is anything in the staging area.
plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
plugins/git4idea/src/git4idea/update/GitUpdater.java