Log In
Join
for free
Back To Module Home
Git and GitHub
0% completed
Before We Begin
About this Module
Introduction to Git
What is Source Control?
The Four Phases of Git Content
Branches
What about GitHub?
How Git Differs from Other Version Control Systems (VCS's)
Git Basics
Introduction: Git Basics
Initializing Git Repository
Looking at Repository's History
Retrieving a Repository's Status
Add Files to a Repository
Committing Changes to a Repository
Challenge: Git Basics
Clone a Repository
Introduction: Clone a Repository
Cloning a Remote Repository
Accidental Deletion
Recover Your Repository
Challenge: Clone a Repository
Git Branching
Introduction: Git Branching
Creating a Branch
Detached Heads
What about Tags?
Conclusion: Git Branching
Challenge: Git Branching
Merging
Introduction: Merging
A Toy Merging Example
Merging Step by Step
Handling Merge Conflicts
Challenge: Merging
Git Stash
Introduction: Git Stash
Dealing With a Scenario
Choosing Your Stash
Challenge: Git Stash
Git Add Interactive
Introduction: Git Add Interactive
The Add Interactive Command
Reflog
Introduction: Reflog
Lose a Commit, Get it Back
Challenge: Reflog
Cherry Picking
Introduction: Cherry-Picking
A Simple Cherry-Pick
When Cherry-Picking Might Fail
Challenge: Cherry-Picking
Git Rebase
Introduction: Git Rebase
Outline of a Simple Rebase
Walkthrough of a Simple Rebase
Git Bisect
Introduction: Git Bisect
Bisecting: The Session at a High Level
A Real 'git bisect' Session
The Difference Between ∼ and ^
Fetching and Pulling Content
Introduction: Fetching and Pulling Content
Two Git Repos: 'git_origin' and 'git_cloned'
The 'git fetch' Command
Working With Multiple Repositories
Introduction: Working With Multiple Repositories
Three-Linked Repositories
Challenge: Working With Multiple Repositories
Pushing Code
Introduction: Pushing Code
Creating and Pushing Branches
Pushing to Repositories With Different Content
The Branch Exists Only On The Remote
Tracking Remote Branches With Different Names
Git Submodules
Introduction: Git Submodules
A Worked Example
The 'git submodule' Command
Git Tracks the Submodule’s State
Cloning a Project With Submodules
Pull Requests
What Are Pull Requests?
Forking And Branching in GitHub
Git Log
Introduction: Git Log
A Realistic Log History
The 'git log' Command
Squashing Commits
Introduction: Squashing Commits
A Worked Example
The 'git rebase -i' Command
Bare Repositories
Introduction: Bare Repositories
Setting up a Bare Repository
Squashes the Commits
Git Pull and Merge Hell
Cherry-Picking and Three-Way Merges
Introduction: Cherry-Picking and Three-Way Merges
Attempting to Apply Cherry-Pick
Generate and Apply Patch
Git Hooks
Introduction: Git Hooks
A ‘pre-commit’ Hook
A More Sophisticated Example
Additional Information on Hooks
Conclusion
Final Remarks
Home
/
...
/
Introduction: Git Rebase
Introduction: Git Rebase
Overview of the upcoming chapter.
This chapter covers:
git rebase
What “fast-forward” means
...