Git & GitHub Workshop at TCNJ - 10 December 2012

_Links.md

Course Repository - https://github.com/TCNJ-ACM-Workshops/tcnj-acm-workshops.github.com

Scripts - https://github.com/matthewmccullough/scripts

Course Website - http://tcnj-acm-workshops.github.com

Divvy - http://mizage.com/divvy/

Command Log

cd tcnj/
ls
pwd
~/gitscripts/historytail 
git init
touch README
nano README 
git status
git add README 
git status
ls
git commit
git status
cd tcnj/
nano README 
git status
git add README 
git commit
subl README 
git status
git commit
touch example_file
git status
clear
git status
git commit
git add example_file 
git commit
git status
ls
subl README 
git status
git help config
git status
subl .
git checkoout c42124c
git checkout c42124c
git checkout 496d36d
cat ~/gitscripts/git-graphlive 
clear
git checkout HEAD
cd ..
ls
git clone [email protected]:johndbritton/swot.git
ls
cd swot/
ls
subl .
git status
git add lib/domains/edu/tcnj
git commit -m 'clear whitespace'
git status
cd tcnj
tree
ls -alh
cd .git/
ls
rm -rf hooks/
tree
cat .git/refs/heads/master
cat .git/refs/heads/master
cd ..
ls
cd tcnj/
ls
cat .git/refs/heads/master 
cat .git/HEAD 
git hash-object README 
git hash-object README 
git hash-object example_file 
ls
git show 496d36d
git show e69de29
git hash-object README 
git show db9204c858
git show
git help show
git status
git checkkout master
git checkout master
clear
git status
subl .
git status
git add README 
git commit -m 'experimental development'
git branch
git branch bugfix
git branch
git checkout bugfix
git branch
git status
git add example_file 
git status
git commit -m 'fix a bug'
git checkout master
git checkout bugfix
git checkout master
git branch
git status
git add README 
git commit -m 'more experimenting'
git status
git branch
git merge bugfix
git branch stash
git branch -d stash
git branch hide
touch example_file
git checkout hide
git status
git add example_file 
git status
touch another-file
git status
git status
git stash
git status
git add another-file 
git status
git stash
git status
git checkout master
git status
git stash pop
git status
cd ..
ls
rm -rf swot/
mkdir tcnj-acm-workshops.github.com
cd tcnj-acm-workshops.github.com/
git init
git remote add origin [email protected]:TCNJ-ACM-Workshops/tcnj-acm-workshops.github.com.git
git push origin master
git touch README
git add RE
git status
ls
git touch README
touch README
git add README 
git push origin master
git status
git commit -m 'add readme'
git push origin master
ls
nano index.html
open index.html 
ls
git status
git add index.html 
git commit -m 'add first homepage'
git push origin master
ls
subl .
git status
git add index.html 
git add index.html 
git commit -m 'make the image smaller'
git push origin master
cd ..
ls
cd tcnj
ls
clear
git status
git reset HEAD
git status
git reset --hard HEAD
git statu
git status
git reset --hard HEAD
git status
git diff
ls
git reset --hard master
git statu
git status
ls
rm another-file 
ls
git status
git branch
git branch -d bugfix
git branch
git branch -d hide
git branch
git branch trouble
git branch
tree
cat .git/refs/heads/trouble 
nano .git/refs/heads/another-branch
tree
git log
nano .git/refs/heads/bugfix
git branch -d bugfix
git branch -d another-branch
git branch
git checkout trouble
git status
subl .
git status
git add README 
git commit -m 'in the middle'
git checkout master
git status
git add README 
git commit -m "it's the end"
git status
git branch
git merge trouble
git status
git status
git add README 
git status
git commit
cd ..
ls
git clone https://github.com/johndbritton/tcnj-acm-workshops.github.com.git website
ls
cd website
git log
git remote
git remote
git remote origin
git remote show
git help remote
git remote -v
git remote add ssh [email protected]:johndbritton/tcnj-acm-workshops.github.com.git
git remote -v
git remote add fake sdlkfjasdkfjasldjfasldkjf
git remote -v
git remote rm fake
git remote rm ssh
git remote -v
git branch
ls
open index.html 
git branch john
git checkout john
git branch
subl .
which subl
cat /usr/bin/subl 
mkdir profiles
ls
git status
git add profiles/johndbritton.html 
git status
open index.html 
git status
git add index.html 
git status
git status
git add index.html 
git status
git commit -m 'add my profile page'
git push origin john
git push origin john
ls
git push origin john
git remote rm origin
git remote add origin [email protected]:rails/rails.git
git push origin john
git remote rm origin
git remote add origin [email protected]:johndbritton/tcnj-acm-workshops.github.com.git
git push origin john
cd ..
ls
git clone https://github.com/johndbritton/tcnj-acm-workshops.github.com.git test
cd test
git push origin master
cd ..
ls
rm -rf test
cat ~/.ssh/id_rsa.pub 
cd website/
git push origin john
git remote add goakley
git remote add goakley [email protected]:goakley/tcnj-acm-workshops.github.com.git
git remote rm goakley
git remote add goakley [email protected]:goakley/tcnj-acm-workshops.github.com.git
git pull goakley goakley
git status
subl index.html 
git status
git add index.html 
git commit
git status
git push
git status
~/gitscripts/git-graphlive 
cd ..
cd website/
ls
git status
subl .
git add remote upstream [email protected]:TCNJ-ACM-Workshops/tcnj-acm-workshops.github.com.git
git add remote upstream [email protected]:TCNJ-ACM-Workshops/tcnj-acm-workshops.github.com.git
git remote add upstream [email protected]:TCNJ-ACM-Workshops/tcnj-acm-workshops.github.com.git
git pull upstream master
git pull
git stash
git pull upstream master
subl .
git status
git add index.html 
git commit
git stash pop
subl .
git diff
git sttus
git status
git push origin john
git branch
subl index.html 
git remote add upstream [email protected]:TCNJ-ACM-Workshops/tcnj-acm-workshops.github.com.git
git pull upstream master
git status
git pull upstream master
ls
subl .
git status
git add index.html 
git commit -m 'link the pages'
git branch
git status
git reset HEAD~1
git status
git log
git checkout master
git stash
git checkout master
git status
git pop
git stash pop
git status
git add index.html 
git commit -m 'link the pages'
git log
git push upstream master
git pull upstream master
git status
git add index.html 
git commit -m 'really link the pages'
git pull upstream master
git push upstream master
git status
git branch
cd ..
cd tcnj
~/gitscripts/git-graphlive 
cd ..
cd tcnj
git status
git checkout -b commenting
git branch
~/gitscripts/generaterandomchanges 3 commenting rb
ls
git checkout master
ls
touch text-display-enhancements.rb
git add text-display-enhancements.rb 
git commit -m 'enhance'
git status
git log
ls
git checkout commenting
git status
ls
git checkout master
ls
git checkout master
git checkout commenting
git branch
git rebase -i master
git checkout commenting
subl .
git status
git add commenting3.rb 
git commit -m 'update magic number'
git checkout master
git status
touch commenting3.rb
nano commenting3.rb 
git add commenting3.rb 
git commit -m 'cause a conflict'
git status
git checkout commenting
~/gitscripts/generaterandomchanges 2 some c
git rebase -i master
git status
nano commenting3.rb 
git status
git add commenting3.rb 
git status
git rebase --continue
git status
nano commenting
nano commenting3.rb 
git status
git add commenting3.rb 
git rebase --continue
~/gitscripts/git-graphlive 
~/gitscripts/historytail 1 20