use reset
Merge branch 'fixbug' of github.com:menghuanwd/gituser into fixbug