gistfile1.txt

apollo:uPortal edalquist$ git fetch upstream
remote: Counting objects: 20, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 11 (delta 8), reused 11 (delta 8)
Unpacking objects: 100% (11/11), done.
From github.com:Jasig/uPortal
   570a685..db13c90  master     -> upstream/master
apollo:uPortal edalquist$ git checkout master
Switched to branch 'master'
apollo:uPortal edalquist$ git merge upstream/master
Updating 570a685..db13c90
Fast-forward
 .../layout/theme/universality/preferences.xsl      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
apollo:uPortal edalquist$ git push origin master
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:edalquist/uPortal.git
   570a685..db13c90  master -> master