#HISTORY cleared 08-21 09:25:48 #HISTORY started 08-21 09:25:56 start_recording git status nano abstract.txt git status git add abstract.txt git status git commit abstract.txt -m "Line 1 is added" git status git log nano abstract.txt git status git add abstract.txt git commit abstract.txt git status git log ls -a ls git diff nano abstract.txt git diff git add abstract.txt git diff git diff --staged git status git commit -m "Line 3 is added" git diff --staged git diff git diff HEAD~1 abstract.txt git diff HEAD~2 abstract.txt git log git diff e8779f1a850302ebe9b1bfc2d141fba953e31bfe abstract.txt git diff e8779f1 abstract.txt git checkout HEAD~1 abstract.txt cat abstract.txt git checkout HEAD abstract.txt cat abstract.txt git log git checkout e8779f1a850302ebe9b1bfc2d141fba953e31bfe abstract.txt cat abstract.txt git checkout HEAD abstract.txt cat abstract.txt mkdir data touch data/a.dat data/b.dat a.out b.out ls git status nano .gitignore git status git add .gitignore git commit .gitignore -m ".gitignore is added" git status git add a.out git status --ignore git status --ignored ls git status git remote add origin https://github.com/jiarong/thesis.git git remove -v git remote -v git push orgin master git push origin master git pull origin master cd ~/Desktop/ mkdir thesis-bob cd thesis-bob cd .. cd ~/Desktop/ git clone https://github.com/jiarong/thesis.git thesis-bob cd thesis-bob ls ls - ls -a git status nano results.txt git add results.txt git commit results.txt -m "results.txt is added by bob" git push origin master cd ~/Desktop/thesis git status git pull origin master cat results.txt nano results.txt git status git add results.txt git commit results.txt -m "Line 3 is added by me" git push origin master cd ~/Desktop/thesis-bob git pull origin master cat results.txt nano results.txt git add results.txt git commit results.txt -m "Line 4 is added by bob" git push origin master cd ~/Desktop/thesis ls nano results.txt git add results.txt git commit -m "Line 4 added by me" git push origin master git push origin master git pull origin master nano results.txt git add results.txt git commit -m "Resolved conflicts in Line 4 in results.txt" git push origin master #HISTORY stopped 08-21 11:57:26