Git is a PITA! I do all my changes locally, and when I'm satisfied, I'll do a fresh fork of the repo, make my changes manually, then submit pull request to upstream.
If you take the time, you can learn to do it all via terminal, but I'm always afraid I'm going to bork something, so I stick with manual commits via Github web interface.