Use
git status
to check what's going on.
Then
git checkout master
git merge --squash bugfix
git add (add which files you want or use wildcard command like ".")
Then
git commit -m "message"
And now last but not the least
git push -u origin master
Here origin
can be other remote you prefer.