GitHub Online Class History for 2012-07-13

cli-history.md

git clone git://github.com/matthewmccullough/hellogitworld.git practice1
cd practice1
git log

cd ..
git clone git@github.com:matthewmccullough/hellogitworld.git practice2
ls
cd practice2
mkdir thousands
cd thousands
generaterandomfiles 5000 sample txt
ls
git add .
git commit -m"Thousands"
git push
git --version

cd ..


git clone https://github.com/githubstudents/hellogitworld-1.git
cd hellogitworld-1
git log
vim matthewmccullough.txt
git add matthewmccullough.txt
git commit -m"Matthew added his name"
git push
mate ~/.gitconfig
git push

ls
git remote -v
git remote add official https://github.com/matthewmccullough/hellogitworld.git
git fetch official
git merge official/master
ls
git fetch official
git branch -a
git branch -r
git remote -v
git branch featurematthewmccullough
open .
git checkout featurematthewmccullough
vim featurematthewmccullough.txt
git add featurematthewmccullough.txt
git commit -m"Matthew McCullough"
git checkout master
git checkout featurematthewmccullough
git push -u origin featurematthewmccullough
git checkout master
git checkout featurematthewmccullough
vim featurematthewmccullough.txt
git add .
git commit -m"Fixed it"
git push
git checkout master
git merge featurematthewmccullough
git remote add bryan https://github.com/bryangm/hellogitworld.git
git fetch bryan

vim matthewmcculloughconflict.txt
git add .
git commit -m"Matthew on master"
git branch matthewconflict
vim matthewmcculloughconflict.txt
git add .
git commit -m"Master wants it this way"
git checkout matthewconflict
vim matthewmcculloughconflict.txt
git add .
git commit -m"Feature branch wants it this way"
git checkout master
git merge matthewconflict
ls
git status
cat matthewmcculloughconflict.txt
git mergetool -t myaraxis
git status
git commit 
git status
vim matthewmccullough.txt
git stash
git status
git stash pop
git stash
vim matthewmccullough.txt
git stash
git stah list
git stash list
git stash pop
git stash save "This is good stuff"
git stash list
git log
git tag RELEASE_1.0
git tag RELEASE_1.2
git tag RELEASE_1.3 b1d6595ca2e8641ac5ad5e5b0c2a656594436663
git tag -a RELEASE_1.4 b1d6595ca2e8641ac5ad5e5b0c2a656594436663
git show RELEASE_1.3
git show RELEASE_1.4
git tag -s RELEASE_1.5 b1d6595ca2e8641ac5ad5e5b0c2a656594436663
git config --local user.email "matthewm@ambientideas.com"
git tag -s RELEASE_1.5 b1d6595ca2e8641ac5ad5e5b0c2a656594436663
generaterandomchanges 3 rollmeback txt
git log
git revert 92966dc9ca7f772981d6b868ac35e49f72c40ab3
git log
git reset --soft d242a5f4964ae6626c3aff85c8a64405bd4fefdb
git commit -m"Rolling entirely back to 10:13 am"

git log
git checkout 8d09a6e2e819a8089b98cb6c0a1b76bb89ef9cb7 -- matthewmccullough.txt
git checkout 8d09a6e2e819a8089b98cb6c0a1b76bb89ef9cb7 -- README.txt
git status
git log --follow --all -- README.txt --decorate
git log --follow  --decorate -- README.txt 
open .
cd ..
git svn clone --stdlayout http://ambientideas.unfuddle.com/svn/ambientideas_demo unfuddle.git
cd unfuddle.git
git log
ls
mate mattfile.txt
git add .
git commit -m"Matthew in git to subversion"
git svn dcommit
git svn rebase
git log
cd ..
svn co https://github.com/bryangm/hellogitworld/trunk bryantrunk

conflict-process.md

1. created a file on the master branch
2. added and commited the file
3. created a branch named conflict
4. I made ONE MORE CHANGE to the file on the master branch
5. I checked out the conflict branch
6. I changed, added and committed the same file (same line)
7. git checkout master
8. git merge conflict
9. The conflicts were reported as an attempt of the merge
10. The conflicts were reported in git status

If desired, abort with:

11. git merge --abort