wethu
3/20/2014 - 7:24 AM

gistfile1.txt

My Mac:
~/www/comprint $ git status
On branch master
Your branch is up-to-date with 'origin/master'.

nothing to commit, working directory clean
~/www/comprint $ 

~/www/comprint $ git log
commit 37cb576cbeb9e982f2ab7bd642e16a8445486d08
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 16:16:42 2014 +1000

    commiting changes to gitignore

commit 43f69db56d16b4d0b409435f58a7085393a85bbd
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 16:15:39 2014 +1000

    removed public folder from git, and modified .gitignore to ignore it forever

commit 150ffdb41d14607672fccddebeaf817306ec404f
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 15:47:09 2014 +1000

    removed database.yml

My Server:

server@comprint:~/app/comprint$ git log
commit 0b8a207e5602b587775fd99af4836fd29731abc3
Merge: a4e61e6 37cb576
Author: Server <server@comprint.comprintserver>
Date:   Thu Mar 20 16:31:06 2014 +1000

    Merge branch 'master' of https://github.com/wethu/comprint

commit 37cb576cbeb9e982f2ab7bd642e16a8445486d08
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 16:16:42 2014 +1000

    commiting changes to gitignore

commit 43f69db56d16b4d0b409435f58a7085393a85bbd
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 16:15:39 2014 +1000

    removed public folder from git, and modified .gitignore to ignore it forever

commit 150ffdb41d14607672fccddebeaf817306ec404f
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 15:47:09 2014 +1000

    removed database.yml



git log @{u}:

server@comprint:~/app/comprint$ git log @{u}
commit 37cb576cbeb9e982f2ab7bd642e16a8445486d08
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 16:16:42 2014 +1000

    commiting changes to gitignore

commit 43f69db56d16b4d0b409435f58a7085393a85bbd
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 16:15:39 2014 +1000

    removed public folder from git, and modified .gitignore to ignore it forever

commit 150ffdb41d14607672fccddebeaf817306ec404f
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 15:47:09 2014 +1000

    removed database.yml

commit 97c7c558b33c6bfe4af02aebf275730de32aecd4
Author: Ellis Gray <ellisgray2012@gmail.com>
Date:   Thu Mar 20 14:12:51 2014 +1000