True Git

Using git through command line and graphical user interfaces.

Transcript

1. True Git Distributed Concurrent Version System
2. First version control
4. Single Point of Failure Server down = No commits/ collaboration Disk corrupted = History lost
5. Store data as changes to a base version of each file
7. Every checkout is a full backup of all the data
8. Store data as snapshots of the filesystem
9. Init or Clone
10. $ git init
12. $ git clone https://myuser:mypass@dev.com/project.git Or $ git git@dev.com/project.git
14. work, work...
15. Status
18. $ git status On branch master Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: README Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: benchmarks.rb
19. Commit
20. $ git diff @@ -36,6 +36,10 @@ def main + print “hi, git” - print “hi, svn”
21. $ git add sample_text.txt $ git commit -m “Add a poem about the singularity”
22. $ git log commit ca82a6dff817ec66f Author: Fernando <fernando@dev.com> Date: Mon Mar 17 21:52:11 2013 -0700 Fix log out feature (issue #1)
27. $ git commit --amend -m “Add better commit msg”
29. * You modify files in your working directory. * You stage the files, adding snapshots of them to your staging area. * You do a commit, which takes the files as they are in the staging area and stores that snapshot permanently to your Git directory.
30. Branches
37. $ git checkout -b my_branch $ git add sample_text.txt $ git commit -m “Add a poem about the singularity”
39. Push push me and then just touch me till i can't get my satisfaction, satisfaction...
40. $ git add remote origin https://myuser: mypass@example.com $ git pull $ git push
42. $ git stash $ git stash list $ git stash apply
43. Merge
45. $ git merge my_branch or $ git pull
46. $ git merge issue27 Auto-merging index.html CONFLICT (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result
47. $ git status On branch master You have unmerged paths. (fix conflicts and run "git commit") Unmerged paths: (use "git add <file>..." to mark resolution) both modified: index.html
48. <<<<<<< HEAD <div id="footer">contact : support@dev.com</div> ======= <div id="footer"> please contact us at support@dev.com </div> >>>>>>> iss53
49. git mergetool Meld, WinDiff, BeyondCompare...
51. $ git blame -L 12,22 sample_text.txt ^4832fe2 (Fernando 2014-02-11 10:31:28 -0700 12) if (this.id == myThread.id) ^4832fe2 (Fernando 2014-02-11 10:31:28 -0700 13) myThread.suicide()
52. Merge versus Rebase
53. Time to play with branches http://pcottle.github.io/learnGitBranching/?NODEMO
54. Git Book: http://git-scm.com/book Rebase vs Merge wars: http://stackoverflow. com/questions/457927/git-workflow-and-rebase-vs-merge- questions Why is merging in Git better than in SVN: http://stackoverflow.com/questions/2471606/how-and-or- why-is-merging-in-git-better-than-in-svn/2472251#2472251 There is much more to it