Git introduction workshop for scientists
•
4 gefällt mir•1,908 views
These are the slides for a workshop I gave on June 2, 2014 at USC. They are an introduction to git and version control for my fellow scientists. Note that the branching section draws heavily on the diagrams and material from the Pro Git book (http://git-scm.com/book/), though I reimplemented them for my own uses.
Empfohlen
Weitere ähnliche Inhalte
Was ist angesagt?
Was ist angesagt? (20)
Ähnlich wie Git introduction workshop for scientists
Ähnlich wie Git introduction workshop for scientists (20)
Mehr von Steven Hamblin
Mehr von Steven Hamblin (19)
Kürzlich hochgeladen
Kürzlich hochgeladen (20)
Git introduction workshop for scientists
- 1. for me, for you.
- 2. Git is version control.
- 3. What is version control?
- 12. 1
- 13. 1 2
- 14. 1 2
- 15. 1 2
- 17. git commit -m "Initial commit." the program the git command the command options git commit add checkout reset branch merge clone pull push
- 20. repository
- 22. working copy
- 24. Outbox manuscript.tex • added 2 paragraphs • deleted 3 lines • moved 4 lines down • ... git add …
- 25. git commit … Outbox commit: 83296a31... author: Steven Hamblin Date: Friday May 9, 20:03:39 2014 Fixed introduction in manuscript.tex
- 26. Manuscript git checkout … Outbox manuscript.tex • added 2 paragraphs • deleted 3 lines • moved 4 lines down • ... git add … Outbox commit: 83296a31... author: Steven Hamblin Date: Friday May 9, 20:03:39 2014 Fixed introduction in manuscript.tex git commit …
- 27. Let’s try it.
- 29. Outbox manuscript.tex • added 2 paragraphs • deleted 3 lines • moved 4 lines down • ... git add …
- 31. git commit … Outbox commit: 83296a31... author: Steven Hamblin Date: Friday May 9, 20:03:39 2014 Fixed introduction in manuscript.tex
- 34. commit size tree author committer 09f0e... Steven Steven Initial commit. tree size blob blob blob 25351 manuscript.txt README.md 3a44f 8762e Figure1.pdf blob size This is going to be an AWESOME NATURE PAPER! blob size ... binary data ... blob size ## README This is the README for my AWESOME NATURE PAPER. de102... 09f0e... 25351... 3a44f... 8762e...
- 38. git commit + git add Outbox commit: 83296a31... author: Steven Hamblin Date: Friday May 9, 20:03:39 2014 Fixed introduction in manuscript.tex Outbox manuscript.tex • added 2 paragraphs • deleted 3 lines • moved 4 lines down • ... git commit -a —>
- 41. commit size tree author committer 09f0e... Steven Steven Initial commit. de102... commit size tree author committer 47ae6... Steven Steven Added my plan d0100... c315c... parent de102... commit size tree author committer 7cae3... Steven Steven Added note of caution. parent c315c... Snapshot CSnapshot BSnapshot A
- 42. Branching.
- 44. Snapshot CSnapshot BSnapshot A de102 d0100 c315c master
- 65. Exercise Try this command: ! git log --graph --pretty --abbrev-commit
- 66. Exercise 1. Checkout the PNAS branch again. 2. Create a new file with some references in it. Call it refs.txt. 3. Add the file, then commit it.
- 68. Exercise 1. Now, checkout master again. 2. Merge the PNAS branch into master again.
- 70. Commit early, commit o en! Branch early, branch o en!
- 71. d0100 git reset git revert git diff
- 72. git reset - - hard <commit> git reset - - so <commit>
- 73. git reset - - hard <commit> git reset - - so <commit> - -hard throws away changes, moves HEAD - -so keeps changes, moves HEAD
- 83. Exercise 1. Make changes and commit, twice. 2. Make uncommi ed changes. 3. Use git reset to throw away the uncommi ed changes.
- 84. Exercise 1. Make more uncommi ed changes. 2. Use git reset to roll back the repository without losing the uncommi ed changes.
- 85. git stash
- 90. Exercise 1. Make uncommi ed changes. 2. Stash those changes 3. Switch branches. Make changes and commit. 4. Switch back and retrieve your stashed changes.
- 91. Collaboration
- 92. user 1's local repository user 2's local repository user 1 user 2 remote repository e.g. GitHub, Bitbucket
- 93. git clone
- 98. git pull
- 101. Exercise 1. Create a GitHub account (github.com) 2. Create a repository on GitHub. 3. Clone the repository to your machine.
- 106. Exercise 1. Make some local changes and commit them. 2. Push the changes to your remote repository.
- 107. Exercise 1. Go to github.com and make some changes on the remote side. 2. Pull the changes into your local.
- 108. Exercise 1. Advanced: change the same file locally and remotely to create a merge conflict. 2. Pull and resolve the conflict.
- 109. Exercise 1. Go to h p://pco le.github.io/ learnGitBranching/ 2. Do the “Main” Introduction sequence and the first “Remote” sequence.
- 110. Share and enjoy!
- 111. Steven Hamblin (steven.hamblin@gmail.com) h p://winawer.org