Download as KEY, PPTX
![Installing Git
root@appliance(~): git
usage: git [--version] [--exec-path[=<path>]] [--html-path]
[-p|--paginate|--no-pager] [--no-replace-objects]
[--bare] [--git-dir=<path>] [--work-tree=<path>]
[-c name=value] [--help]
<command> [<args>]](https://image.slidesharecdn.com/gitmagic-111117162311-phpapp01/85/Git-Magic-Versioning-Files-like-a-Boss-7-320.jpg)
More Related Content
Similar to Git Magic: Versioning Files like a Boss
Git Magic: Versioning Files like a Boss
- 1. Git Magic: Versioning Files Like a Boss Tommy MacWilliam tmacwilliam@cs50.net
- 2. Today • setting uplike a boss • basic git like a boss • using branches like a boss • reverting changes like a boss • collaborating like a boss
- 3. Git is... • “Gitis distributed version control system focused on speed, effectivity and real-world usability on large projects” • “distributed development” • “non-linear development” • “efficient handling of large projects” • “cryptographic authentication of history”
- 4.
- 5.
- 6. Installing Git • Windows:http://code.google.com/p/ msysgit/ • OS X: http://code.google.com/p/git-osx- installer/ • Appliance: already installed!
- 7. Installing Git root@appliance(~): git usage:git [--version] [--exec-path[=<path>]] [--html-path] [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] [--git-dir=<path>] [--work-tree=<path>] [-c name=value] [--help] <command> [<args>]
- 8. git config --global user.name “TommyMacWilliam”
- 9.
- 11.
- 12. Commits • snapshots ofyour project • what your files look like at a given point • single event in project history
- 14.
- 16.
- 19.
- 20.
- 21. git add --all gitcommit
- 22. Commit Messages • shortmessage describing what’s different in this commit • add any new features? • fix some bugs? • break anything?
- 23.
- 24.
- 26. git commit -a-m “oh hi, mark!”
- 28.
- 29.
- 30. Commit 5aeebab117b892fa42002146e4c62be676bc4621 ID b43b0ad1e8108e7ab870d7a54feac93ae8b8600e 461476587780aa9fa5611ea6dc3912c146a91760 HEAD
- 32.
- 33.
- 34. git init git status git add git commit git log git show
- 35. git init git status git add git commit git log git show
- 36. Branches • non-linear developmentprocess • changes on one branch do not affect other branches • crazy idea? make a branch • didn’t work? delete the branch • all done? merge the branch
- 38.
- 39.
- 40. git branch test gitcheckout test
- 41.
- 42. 5aeeb git branch test b43b0 f862f 46147 36223 master test
- 44.
- 45. 5aeeb b43b0 f862f 46147 36223 git merge 87aed master test
- 47.
- 49. git branch -Dtest
- 50. Merge vs. Rebase •git merge: new commit, non-linear history • git rebase: no new commit, linear history
- 51. 5aeeb git branch test b43b0 f862f 46147 36223 master test
- 52. 5aeeb b43b0 git rebase 46147 f862f 36223 master
- 53. Conflicts • change inone branch can be incompatible with another • git tries to resolve, but sometimes cannot
- 54. Conflict Resolution int main(intargc, char** argv) { printf(“you invited all my friends”); } int main(int argc, char** argv) { printf(“good thinking!”); }
- 55. Conflict Resolution int main(intargc, char** argv) { <<<<<<< HEAD:file.c printf(“you invited all my friends”); ======= printf(“good thinking!”); >>>>>>> f862f:file.c }
- 56. git checkout gitbranch git merge git rebase
- 57. git checkout gitbranch git merge git rebase
- 58. git commit -m“oops.”
- 60.
- 61.
- 62. 5aeeb b43b0 46147 git revert b43b0 42bb4 (b43b0)
- 63. File-Specific Reverts • gitcheckout -- index.php • replace with version in index • git checkout b43b0 index.php • replace with version in commit b43b0
- 65. git reset --hardb43b0
- 67.
- 69.
- 71.
- 72. git revert git reset git checkout git bisect
- 73. git revert git reset git checkout git bisect
- 74.
- 76.
- 78.
- 79. git remote addorigin git@github.com:cs50/project
- 80. git remote addorigin git@github.com:cs50/project git push origin master
- 81.
- 83. git pull originmaster
- 85.
- 86. git init git add--all git commit Alice Bob
- 87. git remote addorigin url git push origin master Alice Bob
- 88. git remote addorigin url git push origin master Alice Bob
- 89.
- 90.
- 91. git add --all git commit Alice Bob
- 92. git push originmaster Alice Bob
- 93. git push originmaster Alice Bob
- 94. git pull originmaster Alice Bob
- 95. git pull originmaster Alice Bob
- 97.
- 98. git checkout -b origin/test
- 99.
- 101.
- 102. git remote addlive user@cloud.cs50.net:~/project
- 103. git remote addlive user@cloud.cs50.net:~/project git push live master
- 104. Hooks • applypatch-msg • post-applypatch • commit-msg • pre-commit • post-commit • pre-commit-msg • post-receive • pre-rebase • post-update • update
- 105. post-receive #!/bin/sh GIT_WORK_TREE=/home/tmacwill/public_html git checkout-f chmod -R 644 /home/tmacwill/public_html/ *.html chmod -R 600 /home/tmacwill/public_html/ *.php
- 107.
- 108. git clone git push gitremote git pull
- 109. git clone git push gitremote git pull
- 110. More Resources • http://progit.org/book/ •http://book.git-scm.com/ • http://gitref.org/ • http://git-scm.com/documentation
- 111. git commit -a-m “thanks!”
Editor's Notes
- #2 \n
- #3 \n
- #4 \n
- #5 \n
- #6 \n
- #7 \n
- #8 \n
- #9 \n
- #10 mkdir repo\nvim index.php: <?php echo &#x2018;git rocks&#x2019;; ?>\nvim page.php: <?php echo &#x2018;tommy does, too&#x2019;; ?>\ngit init\n
- #11 \n
- #12 git status\n
- #13 \n
- #14 \n
- #15 \n
- #16 \n
- #17 \n
- #18 \n
- #19 \n
- #20 git add --all\ngit commit\n
- #21 \n
- #22 \n
- #23 vim page2.php: <?php echo &#x2018;woo more commits&#x2019;; ?>\nvim index.php: <?php echo &#x2018;I made a change!&#x2019;; ?>\ngit add --all\ngit commit -m &#x201C;another commit&#x201D;\ngit log\n
- #24 \n
- #25 git show\ngit show PREVIOUS COMMIT\n
- #26 \n
- #27 \n
- #28 \n
- #29 \n
- #30 \n
- #31 git branch test\ngit branch\ngit checkout test\ngit branch\nvim crazy.php: <?php echo &#x2018;this is a crazy idea&#x2019;; ?>\ngit add --all\ngit commit -m &#x201C;so crazy up in here&#x201D;\nls\ngit log\ngit checkout master\nls\ngit log\n
- #32 \n
- #33 \n
- #34 git branch\ngit checkout master\nvim index.php: <?php echo &#x2018;this page is boring&#x2019;; ?>\ngit add --all\ngit commit -m &#x201C;third commit on master&#x201D;\ngit merge test\ngit log\n
- #35 git branch -D test\ngit branch\n
- #36 \n
- #37 \n
- #38 git log --graph\ncd ../rebased\ngit checkout master\ngit rebase test\ngit log --graph\ncd ../repo\n
- #39 \n
- #40 \n
- #41 \n
- #42 \n
- #43 \n
- #44 \n
- #45 \n
- #46 ls\ngit log\nvim index.php: <?php echo &#x2018;good idea&#x2019;; ?>\ngit commit -a -m &#x201C;sweet&#x201D;\nvim index.php: <?php echo &#x2018;bad idea&#x2019;; ?>\ngit commit -a -m &#x201C;oops&#x201D;\ngit revert to commit &#x201C;sweet&#x201D;\nCONFLICT!\ngit status\nvim index.php\ngit commit -a -m &#x201C;revert&#x201D;\ngit log\n
- #47 vim index.php: <?php echo &#x2018;only gonna add this&#x2019;; ?>\ngit add --all\ngit checkout -- index.php\nvim index.php\ngit checkout <commit with &#x201C;sweet&#x201D;> index.php\nvim index.php\n
- #48 git reset --hard HEAD\n
- #49 git checkout <commit with &#x201C;another commit&#x201D;>\ngit log\ngit reflog\ngit checkout master\n
- #50 git bisect good <first commit>\ngit bisect bad HEAD\ngit bisect bad\ngit checkout master\n
- #51 \n
- #52 \n
- #53 \n
- #54 \n
- #55 \n
- #56 \n
- #57 \n
- #58 git remote add origin git@github.com:tmac721/seminar.git\ngit remote\ngit remote show origin\ngit push origin master\n
- #59 cd ../\ngit clone git@github.com:tmac721/seminar.git\ncd test\nls\ngit log\n
- #60 \n
- #61 \n
- #62 \n
- #63 \n
- #64 \n
- #65 \n
- #66 \n
- #67 \n
- #68 \n
- #69 \n
- #70 \n
- #71 \n
- #72 \n
- #73 \n
- #74 \n
- #75 \n
- #76 \n
- #77 \n
- #78 \n
- #79 ssh cloud\nmkdir repo\ncd repo\ngit init --bare\ncd hooks\nvim post-receive: copy this\nchmod a+x post-receive\ngit remote add origin ssh://tmacwill@cloud.cs50.net/home/tmacwill/repo\ngit push origin master\n\n
- #80 \n
- #81 \n
- #82 \n
- #83 \n