Git for beginners

An overview of the essentials required to use Git.
Presented at DunDDD, RIM and ConFoo.ca in 2012.

Transcript

1. git for
   beginners
   Mike McQuaid
   

   View Slide

2. me
   

   View Slide

3. @MikeMcQuaid
   mike@mikemcquaid.com
   http://mikemcquaid.com
   

   View Slide

4. install
   create
   commit
   history
   remote
   fix
   branch
   rewrite
   tools
   help
   

   View Slide

5. install
   

   View Slide

6. 
   Xcode 4
   or
   brew install git
   

   View Slide

7. apt-get install git-core
   

   View Slide

8. 
   msysgit
   

   View Slide

9. git config
   

   View Slide

10. $ git config --global
    user.name "Your Name"
    $ git config --global
    user.email me@example.com
    

    View Slide

11. create
    

    View Slide

12. git init
    

    View Slide

13. $ git init test
    Initialized empty Git repository
    in /Users/you/test/.git/
    

    View Slide

14. git status
    

    View Slide

15. $ git status
    # On branch master
    #
    # Initial commit
    #
    nothing to commit (create/copy
    files and use "git add" to track)
    

    View Slide

16. commit
    

    View Slide

17. git add
    

    View Slide

18. $ git status
    # On branch master
    #
    # Initial commit
    #
    # Untracked files:
    # (use "git add ..." to include in what
    will be committed)
    #
    # ReadMe.txt
    nothing added to commit but untracked files
    present (use "git add" to track)
    

    View Slide

19. $ git add ReadMe.txt
    

    View Slide

20. $ git status
    # On branch master
    #
    # Initial commit
    #
    # Changes to be committed:
    # (use "git rm --cached ..." to
    unstage)
    #
    # new file: ReadMe.txt
    #
    

    View Slide

21. View Slide

22. git commit
    

    View Slide

23. $ git commit -m "Initial commit"
    [master (root-commit) ba9d588] Initial commit
    0 files changed
    create mode 100644 ReadMe.txt
    

    View Slide

24. history
    

    View Slide

25. git log
    

    View Slide

26. $ git log
    commit ba9d5884d2ea8946e9bf3b6c151d61c8cd952cb1
    Author: Your Name
    Date: Mon Feb 27 21:32:41 2012 +0000
    Initial commit
    

    View Slide

27. gitx
    gitk
    

    View Slide

28. View Slide

29. git diff
    

    View Slide

30. $ git status
    # On branch master
    # Changes not staged for commit:
    # (use "git add ..." to update what will be
    committed)
    # (use "git checkout -- ..." to discard
    changes in working directory)
    #
    # modified: ReadMe.txt
    #
    no changes added to commit (use "git add" and/or
    "git commit -a")
    

    View Slide

31. $ git diff
    diff --git a/ReadMe.txt b/ReadMe.txt
    index e69de29..cd08755 100644
    --- a/ReadMe.txt
    +++ b/ReadMe.txt
    @@ -0,0 +1 @@
    +Hello world!
    

    View Slide

32. $ git status
    # On branch master
    # Changes not staged for commit:
    # (use "git add ..." to update what will be
    committed)
    # (use "git checkout -- ..." to discard
    changes in working directory)
    #
    # modified: ReadMe.txt
    #
    no changes added to commit (use "git add" and/or
    "git commit -a")
    

    View Slide

33. $ git add ReadMe.txt
    

    View Slide

34. $ git diff
    

    View Slide

35. $ git diff --staged
    diff --git a/ReadMe.txt b/ReadMe.txt
    index e69de29..cd08755 100644
    --- a/ReadMe.txt
    +++ b/ReadMe.txt
    @@ -0,0 +1 @@
    +Hello world!
    

    View Slide

36. $ git diff master
    diff --git a/ReadMe.txt b/ReadMe.txt
    index e69de29..cd08755 100644
    --- a/ReadMe.txt
    +++ b/ReadMe.txt
    @@ -0,0 +1 @@
    +Hello world!
    

    View Slide

37. $ git diff HEAD
    diff --git a/ReadMe.txt b/ReadMe.txt
    index e69de29..cd08755 100644
    --- a/ReadMe.txt
    +++ b/ReadMe.txt
    @@ -0,0 +1 @@
    +Hello world!
    

    View Slide

38. $ git commit -m "Add ReadMe"
    [master ffc8706] Add ReadMe
    1 file changed, 1 insertion(+)
    

    View Slide

39. $ git log
    commit ffc8706e41abb387993c294d7d46070a4bbd76ba
    Author: Your Name
    Date: Mon Feb 27 21:38:38 2012 +0000
    Add ReadMe
    commit ba9d5884d2ea8946e9bf3b6c151d61c8cd952cb1
    Author: Your Name
    Date: Mon Feb 27 21:32:41 2012 +0000
    Initial commit
    

    View Slide

40. View Slide

41. remote
    

    View Slide

42. git clone
    

    View Slide

43. $ git clone
    git://github.com/mxcl/homebrew.git
    Cloning into 'homebrew'...
    remote: Counting objects: 58026, done.
    remote: Compressing objects: 100%
    (24408/24408), done.
    remote: Total 58026 (delta 37820), reused 50148
    (delta 32895)
    Receiving objects: 100% (58026/58026), 8.69 MiB
    | 59 KiB/s, done.
    Resolving deltas: 100% (37820/37820), done.
    

    View Slide

44. $ git log --stat 29d85
    commit
    29d85578e75170a6c0eaebda4d701b46f1acf446
    Author: Max Howell
    Date: Thu May 21 00:04:11 2009 +0100
    I'll start with a rare Belgian yeast and Sussex hops
    README | 137 ++++++++++++++++++++++++++
    1 file changed, 137 insertions(+)
    

    View Slide

45. git push
    

    View Slide

46. $ git push
    Counting objects: 9, done.
    Delta compression using up to 8 threads.
    Compressing objects: 100% (5/5), done.
    Writing objects: 100% (5/5), 485 bytes, done.
    Total 5 (delta 4), reused 0 (delta 0)
    To git@github.com:mxcl/homebrew.git
    4ab1f7a..753dde9 master -> master
    

    View Slide

47. git fetch
    

    View Slide

48. $ git fetch
    remote: Counting objects: 140, done.
    remote: Compressing objects: 100% (65/65),
    done.
    remote: Total 93 (delta 79), reused 42 (delta 28)
    Unpacking objects: 100% (93/93), done.
    From git://github.com/mxcl/homebrew
    753dde9..3c180ba master -> origin/master
    

    View Slide

49. git pull
    

    View Slide

50. git pull
    =
    git fetch && git merge
    

    View Slide

51. git pull --rebase
    =
    git fetch && git rebase
    

    View Slide

52. $ git pull
    remote: Counting objects: 9, done.
    remote: Compressing objects: 100% (1/1), done.
    remote: Total 5 (delta 4), reused 5 (delta 4)
    Unpacking objects: 100% (5/5), done.
    From git://github.com/mxcl/homebrew
    4ab1f7a..753dde9 master -> origin/master
    First, rewinding head to replay your work on top of
    it...
    Fast-forwarded master to
    753dde9c2cf66848183f3f787f8501dbf5a7e28f.
    

    View Slide

53. View Slide

54. fix
    

    View Slide

55. git mv
    

    View Slide

56. $ git mv ReadMe.txt ReadMe.md
    

    View Slide

57. $ git status
    # On branch master
    # Changes to be committed:
    # (use "git reset HEAD ..." to unstage)
    #
    # renamed: ReadMe.txt -> ReadMe.md
    #
    

    View Slide

58. $ git commit -m "Markdown ReadMe"
    [master a385898] Markdown ReadMe
    1 file changed, 0 insertions(+), 0
    deletions(-)
    rename ReadMe.txt => ReadMe.md
    (100%)
    

    View Slide

59. git rm
    

    View Slide

60. $ git rm ReadMe.md
    rm 'ReadMe.md'
    

    View Slide

61. $ git status
    # On branch master
    # Changes to be committed:
    # (use "git reset HEAD ..." to unstage)
    #
    # deleted: ReadMe.md
    #
    

    View Slide

62. $ git commit -m "Delete ReadMe"
    [master d84ef55] Delete ReadMe
    1 file changed, 1 deletion(-)
    delete mode 100644 ReadMe.md
    

    View Slide

63. View Slide

64. git revert
    

    View Slide

65. $ git revert d84ef55
    [master f286fb4] Revert "Delete ReadMe"
    1 file changed, 1 insertion(+)
    create mode 100644 ReadMe.md
    

    View Slide

66. $ git log HEAD~2..HEAD
    commit f286fb49f622b1292e8560b5c02bb8a33a115221
    Author: Your Name
    Date: Mon Feb 27 21:49:16 2012 +0000
    Revert "Delete ReadMe"
    This reverts commit
    d84ef5556bdbd952030d19449ac6cf4af7a1b975.
    commit d84ef5556bdbd952030d19449ac6cf4af7a1b975
    Author: Your Name
    Date: Mon Feb 27 21:48:53 2012 +0000
    Delete ReadMe
    

    View Slide

67. View Slide

68. git clean
    

    View Slide

69. $ git status
    # On branch master
    # Untracked files:
    # (use "git add ..." to include in what will
    be committed)
    #
    # ReadMe.old
    nothing added to commit but untracked files
    present (use "git add" to track)
    

    View Slide

70. $ git clean -f
    Removing ReadMe.old
    

    View Slide

71. $ git status
    # On branch master
    nothing to commit (working directory clean)
    

    View Slide

72. branch
    

    View Slide

73. git branch
    

    View Slide

74. $ git branch
    * master
    

    View Slide

75. $ git branch testing
    

    View Slide

76. $ git branch
    * master
    testing
    

    View Slide

77. git checkout
    

    View Slide

78. $ git checkout testing
    Switched to branch 'testing'
    

    View Slide

79. $ git branch
    master
    * testing
    

    View Slide

80. $ git add ReadMe.md
    

    View Slide

81. $ git commit -m "Add header"
    [testing 85200e2] Add header
    1 file changed, 1 insertion(+)
    

    View Slide

82. git merge
    

    View Slide

83. $ git checkout master
    Switched to branch 'master'
    

    View Slide

84. $ git diff testing
    diff --git a/ReadMe.md b/ReadMe.md
    index 717157d..cd08755 100644
    --- a/ReadMe.md
    +++ b/ReadMe.md
    @@ -1,2 +1 @@
    Hello world!
    -============
    

    View Slide

85. $ git add License.md
    

    View Slide

86. $ git commit -m "Add license"
    [master 8e7d2b6] Add license
    1 file changed, 1 insertion(+)
    create mode 100644 License.md
    

    View Slide

87. $ git diff testing
    diff --git a/License.md b/License.md
    new file mode 100644
    index 0000000..85265b0
    --- /dev/null
    +++ b/License.md
    @@ -0,0 +1 @@
    +Public domain
    diff --git a/ReadMe.md b/ReadMe.md
    index 717157d..cd08755 100644
    --- a/ReadMe.md
    +++ b/ReadMe.md
    @@ -1,2 +1 @@
    Hello world!
    -============
    

    View Slide

88. View Slide

89. $ git merge testing
    Merge made by the 'recursive' strategy.
    ReadMe.md | 1 +
    1 file changed, 1 insertion(+)
    

    View Slide

90. View Slide

91. $ git branch -d testing
    Deleted branch testing (was 85200e2).
    

    View Slide

92. View Slide

93. git tag
    

    View Slide

94. $ git tag v0.1
    

    View Slide

95. View Slide

96. git stash
    

    View Slide

97. $ git diff
    diff --git a/License.md b/License.md
    index 85265b0..a22a2da 100644
    --- a/License.md
    +++ b/License.md
    @@ -1 +1 @@
    -Public domain
    +MIT
    

    View Slide

98. $ git stash
    Saved working directory and index state
    WIP on master: d13413e Merge branch
    'testing'
    HEAD is now at d13413e Merge branch
    'testing'
    

    View Slide

99. $ git diff
    

    View Slide

100. View Slide

101. $ git stash pop
     # On branch master
     # Changes not staged for commit:
     # (use "git add ..." to update what will be
     committed)
     # (use "git checkout -- ..." to discard changes in
     working directory)
     #
     # modified: License.md
     #
     no changes added to commit (use "git add" and/or "git
     commit -a")
     Dropped refs/stash@{0}
     (a3b0d391ffa40e7483e8c1194c05e628dc13f2fe)
     

     View Slide

102. $ git diff
     diff --git a/License.md b/License.md
     index 85265b0..a22a2da 100644
     --- a/License.md
     +++ b/License.md
     @@ -1 +1 @@
     -Public domain
     +MIT
     

     View Slide

103. View Slide

104. $ git commit -m "Change license"
     [master 836f9b7] Change license
     1 file changed, 1 insertion(+), 1
     deletion(-)
     

     View Slide

105. rewrite
     

     View Slide

106. git reset
     

     View Slide

107. View Slide

108. $ git reset HEAD^
     Unstaged changes after reset:
     M License.md
     

     View Slide

109. $ git diff
     diff --git a/License.md b/License.md
     index 85265b0..a22a2da 100644
     --- a/License.md
     +++ b/License.md
     @@ -1 +1 @@
     -Public domain
     +MIT
     

     View Slide

110. View Slide

111. $ git commit -m "Change license"
     [master 6459532] Change license
     1 file changed, 1 insertion(+), 1
     deletion(-)
     

     View Slide

112. View Slide

113. $ git reset --hard HEAD^
     HEAD is now at d13413e Merge branch 'testing'
     

     View Slide

114. View Slide

115. $ git diff
     

     View Slide

116. git reflog
     

     View Slide

117. $ git reflog
     d13413e HEAD@{0}: reset: moving to HEAD^
     6459532 HEAD@{1}: commit: Change license
     d13413e HEAD@{2}: reset: moving to HEAD^
     836f9b7 HEAD@{3}: commit: Change license
     d13413e HEAD@{4}: merge testing: Merge made
     by the 'recursive' strategy.
     

     View Slide

118. View Slide

119. $ git reset --hard 6459532
     HEAD is now at 6459532 Change license
     

     View Slide

120. View Slide

121. git rebase
     

     View Slide

122. $ git checkout -b testing
     Switched to a new branch 'testing'
     

     View Slide

123. $ git reset --hard 85200e2
     HEAD is now at 85200e2 Add header
     

     View Slide

124. $ git add ReadMe.md
     

     View Slide

125. $ git commit -m "First point"
     [testing 9fa6296] First point
     1 file changed, 1 insertion(+)
     

     View Slide

126. View Slide

127. $ git rebase master
     First, rewinding head to replay
     your work on top of it...
     Applying: First point
     

     View Slide

128. View Slide

129. tools
     

     View Slide

130. git describe
     

     View Slide

131. $ git describe --tags
     v0.1-2-g18a2fde
     

     View Slide

132. git blame
     

     View Slide

133. $ git blame ReadMe.md
     f286fb49 (Your Name 2012-02-27 21:49:16 +0000 1) Hello world!
     85200e28 (Your Name 2012-02-28 14:30:47 +0000 2) ============
     18a2fded (Your Name 2012-02-28 12:03:40 -0500 3) * First point
     

     View Slide

134. git svn
     

     View Slide

135. git bisect
     

     View Slide

136. GitHub
     

     View Slide

137. git help
     

     View Slide

138. $ git help diff
     

     View Slide

139. $ git diff --help
     

     View Slide

140. http://progit.org
     http://help.github.com
     

     View Slide

141. install
     create
     commit
     history
     remote
     fix
     branch
     rewrite
     tools
     help
     

     View Slide

142. https://github.com/
     mikemcquaid/
     GitForBeginnersDemo
     

     View Slide

143. @MikeMcQuaid
     mike@mikemcquaid.com
     http://mikemcquaid.com
     

     View Slide

144. questions?
     

     View Slide