Keep Your Commits Clean
Keep your commits clean. Address only ONE issue per commit. Make sure the project continues to build and run at each commit. Your future cherry-picking or reverting self will appreciate it.
PS: And no sneaking in small, unrelated changes to avoid a code review! You know who you are.