Chapter 22: Git and GitHub Course: Day 4

Summary of Day 4 Work Flow (pg.58):

1. Page 63: Textile (markup language) http://www.hobix.com/textile/quick.html
2. Page 63: My First GitHub Wiki: http://wiki.github.com/jasnow/mygittest
3. Page 63: Branches: http://hoth.entp.com/output/git_for_designers.html
4. I recloned my gittest repo and then created a branch.
5. $ git branch (p.64)
   * master
6. $ git branch rubylearning (p.65)
7. $ git branch
   * master
   rubylearning
8. gitk (p.65-66)
9. $ git checkout rubylearning (p.66)
   Switched to branch "rubylearning"
10. $ git branch (p.67)
    master
    * rubylearning
11. $ git add . (p.67)
    warning: LF will be replaced by CRLF in student.rb
12. $ git status
    # On branch rubylearning
    warning: LF will be replaced by CRLF in student.rb
    # Changes to be committed:
    # (use "git reset HEAD ..." to unstage)
    #
    # modified: student.rb
    #
13. $ git commit -m 'student class first commit sort-of'
    [rubylearning]: created warning: LF will be replaced by CRLF in student.rb
    18e0332: "student class first commit sort-of"
    1 files changed, 3 insertions(+), 3 deletions(-)
14. $ git push origin rubylearning (p.68)
    Counting objects: 5, done.
    Compressing objects: 100% (2/2), done.
    Writing objects: 100% (3/3), 300 bytes, done.
    Total 3 (delta 1), reused 0 (delta 0)
    To git@github.com:jasnow/gittest.git
    * [new branch] rubylearning -> rubylearning
15. Checked GitHub to see that now we have 2 branches.
16. $ git checkout master (p.70)
    Switched to branch "master"
17. $ git branch (p.70)
    * master
    rubylearning
18. $ git diff master rubylearning (p.70)
    diff --git a/student.rb b/student.rb
    index cdba213..5871362 100644
    --- a/student.rb
    +++ b/student.rb
    @@ -1,4 +1,4 @@
    -# student.rb
    -class Student
    +# student2.rb
    +class Student2
    -end
    \ No newline at end of file
    +end
19. $ git checkout master (p.71)
    Already on "master"
20. $ git merge rubylearning # into master (p.71)
    Updating 3660bc5..18e0332
    Fast forward
    student.rb | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)
21. $ git branch -d rubylearning # Delete Branch (p.71)
    Deleted branch rubylearning (18e0332).
22. $ git push origin master (p.71)
    Total 0 (delta 0), reused 0 (delta 0)
    To git@github.com:jasnow/gittest.git
    3660bc5..18e0332 master -> master
23. $ git push origin :rubylearning # Deletes from GitHub (p.71-72)
    To git@github.com:jasnow/gittest.git
    - [deleted] rubylearning
24. Verified only one branch (master) on Github. (p.72)
25. $ git reset --hard ORIG_HEAD (Reversed a merge -- p.72)
    HEAD is now at 3660bc5 Changed my name line in fork.rb
26. LOVE the "Don't actually" after the section. I suggest moving it before paragraph. (p.73)
27. Exercise 5: (p.73-74)
28. Create/modify motorcyle.rb. (p.73)
29. Git add/commit/push (p.73)
30. $ git commit -m 'modified motorcycle.rb' (p.73)
    [master]: created warning: LF will be replaced by CRLF in motorcycle.rb
    89c38f3: "modified motorcycle.rb"
    1 files changed, 3 insertions(+), 3 deletions(-)
31. $ git push origin (p.73)
    To git@github.com:jasnow/gittest.git
    ! [rejected] master -> master (non-fast forward)
    error: failed to push some refs to 'git@github.com:jasnow/gittest.git'
32. So I tried this: $ git push origin master # (Added "master" to end of command line)
    To git@github.com:jasnow/gittest.git
    ! [rejected] master -> master (non-fast forward)
    error: failed to push some refs to 'git@github.com:jasnow/gittest.git'
33. Googled for an anser to step 31+32 error message and found this: http://edspencer.net/2008/04/when-git-tells-you-it-failed-to-push.html
    
34. $ git pull git@github.com:jasnow/gittest.git master # NOTE: ADDED.
    From git@github.com:jasnow/gittest
    * branch master -> FETCH_HEAD
    Merge made by recursive.
    student.rb | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)
35. Then tried step 30 again: $ git push origin master (p.73)
    Counting objects: 8, done.
    Compressing objects: 100% (5/5), done.
    Writing objects: 100% (5/5), 576 bytes, done.
    Total 5 (delta 3), reused 0 (delta 0)
    To git@github.com:jasnow/gittest.git
    18e0332..8306c2e master -> master
36. Create a working branch called "display": $ git branch display (p.65,73)
37. $ git branch (p.65.73)
    display
    * master
38. Switch to working branch: $ git checkout display (p.66,73)
    Switched to branch "display"
39. Edit display.rb.
40. $ git add . (p.67,73)
41. $ git status (p.67,73)
    # On branch display
    # Changes to be committed:
    # (use "git reset HEAD ..." to unstage)
    #
    # modified: display.rb
    #
42. $ git commit -m 'modified display.rb' (p.67,73)
    [display]: created 01e92fc: "modified display.rb"
    1 files changed, 2 insertions(+), 2 deletions(-)
43. $ git push origin display (p.68,74)
    Counting objects: 5, done.
    Compressing objects: 100% (3/3), done.
    Writing objects: 100% (3/3), 351 bytes, done.
    Total 3 (delta 1), reused 0 (delta 0)
    To git@github.com:jasnow/gittest.git
    * [new branch] display -> display
44. Verified "display" branch on GitHub.
45. $ git checkout master (p.71,74)
    Switched to branch "master"
46. $ git merge display (p.71,74)
    Updating 8306c2e..01e92fc
    Fast forward
    display.rb | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)
47. $ git branch -d display (Deleted branch -- p.71,74)
    Deleted branch display (01e92fc).
48. $ git push origin master (p.71,74)
    Total 0 (delta 0), reused 0 (delta 0)
    To git@github.com:jasnow/gittest.git
    8306c2e..01e92fc master -> master
49. $ git push origin :display (Deleted Branch on GitHub)
    To git@github.com:jasnow/gittest.git
    - [deleted] display
50. DONE - WOW
51. Not finished: Pull Request
52. $ git clone git@github.com:jasnow/mygittest.git
    Initialized empty Git repository in c:/Users/jasnow/gitlocalrepo/mygittest/.git/
    
    remote: Counting objects: 6, done.←[K
    remote: Compressing objects: 100% (4/4), done.←[K
    remote: Total 6 (delta 1), reused 0 (delta 0)←[K
    Receiving objects: 100% (6/6), 464 bytes, done.
    Resolving deltas: 100% (1/1), done.
53. git remote add alexnicolini git://github.com/alexnicolini/mygittest.git (p.54)
54. $ git remote show alexnicolini (p.54)
    * remote alexnicolini
    URL: git://github.com/alexnicolini/mygittest.git
    New remote branch (next fetch will store in remotes/alexnicolini)
    master
55. $ git fetch alexnicolini (p.55)
    remote: Counting objects: 9, done.←[K
    remote: Compressing objects: 100% (6/6), done.←[K
    remote: Total 9 (delta 2), reused 0 (delta 0)←[K
    Unpacking objects: 100% (9/9), done.
    From git://github.com/alexnicolini/mygittest
    * [new branch] master -> alexnicolini/master
56. $ git log alexnicolini/master
57. commit 217ad082c3f2a63150b28f18a1820845575d9fcc
    Author: alexnicolini
    Date: Tue Feb 24 22:19:16 2009 -0300
    Added a new line
    commit 22b8b693c1935696e2acee48a4185a49ac39227d
    Author: Al Snow
    Date: Mon Feb 23 12:35:38 2009 -0500
    adding fork.rb file
    commit 2eca6e8195ee9a9043b300e0625fd09100ef6008
    Author: Al Snow
    Date: Sun Feb 22 12:54:57 2009 -0500
    First commit
    jasnow@JASNOW-PC ~/gitlocalrepo
58. $ git merge alexnicolini/master (p.55)
    Updating 22b8b69..217ad08
    Fast forward
    fork.rb | 1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
59. $ git add . (p.56)
60. $ git commit -m 'merging for alexnicolini' (p.56)
    # On branch master
    # Your branch is ahead of 'origin/master' by 1 commit.
    #
    nothing to commit (working directory clean)
61. $ git push origin master (p.56)
    Counting objects: 5, done.
    Compressing objects: 100% (2/2), done.
    Writing objects: 100% (3/3), 291 bytes, done.
    Total 3 (delta 1), reused 0 (delta 0)
    To git@github.com:jasnow/mygittest.git
    22b8b69..217ad08 master -> master