Brucehankins I just keep the repo directory on my machine, and run make pull both right after my patch has been accepted, and before starting the process to do another update to the package, just to be extra sure that my local copy matches what's on the server.
make pull in the package directory will pull the latest stuff from dev.getsol.us, and automatically git rebase for you to make sure that you're at the HEAD, or latest commit.