Use git Reset
Reset reset current head to the specified state: [remove commit]
Wanqi @ wanqi-system-product-Name :~ /Huiye_2.3.5/mydroid $ git reset head ^
Unstaged changes after reset:
M packages/apps/email/androidmanifest. xml
M packages/apps/email/RES/layout/account_folder_table.xml
M packages/apps/email/src/COM/Android/email/activity/accountfolderlist. Java
M packages/apps/email/src/COM/Android/email/activity/accountfoldermain. Java
M packages/apps/email/src/COM/Android/email/activity/welcome. Java
Wanqi @ wanqi-system-product-Name :~ /Huiye_2.3.5/mydroid $ git status
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
# 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: packages/apps/email/androidmanifest. xml
# Modified: packages/apps/email/RES/layout/account_folder_table.xml
# Modified: packages/apps/email/src/COM/Android/email/activity/accountfolderlist. Java
# Modified: packages/apps/email/src/COM/Android/email/activity/accountfoldermain. Java
# Modified: packages/apps/email/src/COM/Android/email/activity/welcome. Java
#