Home | Download Now | Read Now | Source | Feeback

Introduction
• How this book works

Setting up
• Making sure you have everything

Week 1
• Day 1 - "Things need to change"
• Day 3 - "A possible solution"
• Day 4 - "A decision is reached"
• Day 5 - "Working like a team"

After Hours Week 1
• "History Lesson"

Week 2
• Day 1 - "We are coders, we use Git!"
• Day 2 - "Making commitments"
• Day 4 - "Let's do this right, not fast"
• Summary - John's Notes

After Hours Week 2
• "A Little Of Git's Internals"

Week 3
• Day 1 - "How do I see what's going on?"
• Day 2 - "But I need more information"
• Day 3 - "What actually changed?"
• Day 4 - "Finding a good reference point"
• Day 5 - "Putting things back again"
• Summary - John's Notes

After Hours Week 3
• "A Closer Look At Diffs and Tags"

Week 4
• Day 1 - "We're getting somewhere"
• Day 2 - "Branches galore"
• Day 3 - "Tricking the twigs"
• Day 4 - "I pressed delete..."
• Day 5 - "Conflicting information"
• Summary - John's Notes

After Hours Week 4
• "Merge merge merge"
• "Grepping your life away"

Week 5
• Day 1 - "This isn't working for me John"
• Day 2 - "Back to logging"
• Day 4 - "Advanced Techniques"
• Summary - John's Notes

After Hours Week 5
• "Splitting up commits the easy way"

Week 6
• Day 1 - "My private little stash"
• Day 2 - "What?! No backup?"
• Day 3 - "Is this clone for real?"
• Day 4 - "Help I'm no longer up to date?"
• Day 5 - "I'm putting my foot down"
• Summary - John's Notes

After Hours Week 6
• "Tug of war"
• "Referring to objects"

Week 7
• Day 1 - "Networking with a difference"
• Day 2 - "Now let's work together"
• Day 3 - "Rebasing our commitments"
• Day 4 - "Starting to get rebased"
• Day 5 - "I could rebase the world"
• Summary - John's Notes

After Hours Week 7
• "Network Communicating"

Week 8
• Day 1 - "Give a man a patch"
• Day 2 - "Looking for problems"
• Day 3 - "Filtered repos"
• Day 4 - "Let's make a library"
• Day 5 - "Shhh....we're in a library"
• Summary - John's Notes

After Hours Week 8
• "Fishing for beginners"

A little extra help
• Taking things further
• The end of the journey

Week 4

Summary - John's Notes

Commands

git branch <branch_name> - Creates a new branch with a given name
git checkout <branch_name> - Switches to a new branch
git log -n1 - Limits the output of the log command to only a single commit
git branch -v - Verbosely list all local branches
git show <reference> - Show the information pointed to by the reference
git merge <branch_name> - Merge in a given branch to the current one
git checkout -b <branch_name> - Create a new branch and switch into it in one go
git reset --hard <commit_ref> - Reset a branch to a specific commit reference
git log --graph --pretty=oneline --all --abbrev-commit --decorate - Shows a graphical view of the repository
git log --graph --oneline --all --decorate - A shorter form of the above command
git branch -d <branch_name> - Delete a branch that has already been merged
git branch -D <branch_name> - Forcibly delete a branch
git branch <branch_name> <commit_ref> - Create a new branch, starting at the commit reference
git reset --merge - Abort a merge and reset back to pre-merge state
git diff <commit_1> <commit_2> -- <files> - Show the difference between the two commits, for certain files

Terminology

Conflict - A conflict occurs when an attempt is made to reconcile multiple changes to the same section of a file at the same time.
Fast-Forward Merge - The simplest merge type, which simply winds a branch forward in time to meet the tip of another.

home | download | read now | source | feedback | legal stuff