Page History

...

Host code.stanford.edu
  Hostname code.stanford.edu
  User git
  ProxyCommand ssh <your_unix_id>@psproxy nc %h %p

Host github.com
   Hostname github.com
   User git
   ProxyCommand ssh <your_unix_id>@psproxy nc %h %p

NOTE: make sure you "chmod 600 ~/.ssh/config", otherwise ssh will complain, bitterly.

To access GitHub repos using HTTPS, set your Git http.proxy using 

git config --global http.proxy http://psproxy:3128

...

Useful Commands

Check status of the repo

...

This can fail if upstream is ahead of you local version. In this case you first have to get the most recent changes from upstream:

Here is a blog post that explains the difference between merge and rebase

git fetch origin 
git rebase -p origin

...