git commit -a : -a stages all files that are tracked and modified
  without needing to explicitly git add them.
git remote show origin
git pull origin master
when ready to post: 
  git checkout shared
  git merge cb
git mergetool (requires setting [merge] tool = vimdiff in config)
git pull = fetch + merge