1. git reset --hard
git pull --rebase
2. git stash
http://www.cnblogs.com/craftor/archive/2012/11/04/2754149.html
http://blog.chinaunix.net/uid-25871104-id-3419159.html
1. git reset --hard
git pull --rebase
2. git stash
http://www.cnblogs.com/craftor/archive/2012/11/04/2754149.html
http://blog.chinaunix.net/uid-25871104-id-3419159.html