reset-to-keep-master-clean.sh

# Sometimes we could mistakenly commit something without pull first, so
# here is how we revert this process and keep our master branch clean.

# Reset back to the commit before you last commit.
# git reset --mixed will keep your changes and revert other files back 
# to that commit.
git pull
git reset --mixed HEAD-before-your-last-commit

# Commit your changes again.
git add .
git commit -m "Your newest commit message"

# Push to origin then all settled.
git push