This book teaches Git in a simple, visual, and tangible manner so that you can build a solid mental model of how Git version control works. Through the use of color, storytelling, and hands-on exercises, you will learn to use this tool with confidence.
The information is introduced incrementally so that you don't get bogged down with unknown terms or concepts. Learning Git is ideal for anyone who needs to use Git for personal or professional projects: coding bootcamp students, junior developers, data professionals, and technical writers, to name just a few!
This book covers how to:
• Download Git and initialize a local repository
• Add files to the staging area and make commits
• Create, switch, and delete branches
• Merge and rebase branches
• Work with remote repositories including cloning, pushing, pulling, and fetching
• Use pull requests to collaborate with others
Author(s): Anna Skoulikari
Edition: 1
Publisher: O'Reilly Media
Year: 2023
Language: English
Commentary: Publisher's PDF
Pages: 318
City: Sebastopol, CA
Tags: Git; Version Control Systems
[ Preface ]
Chapter 1. Git and the Command Line
What Is Git?
The Graphical User Interface and the Command Line
Opening a Command Line Window
Executing Commands in the Command Line
Installing Git
Command Options and Arguments
Clearing the Command Line
Opening the Filesystem Window
Working with Directories
Closing the Command Line
Setting Git Configurations
Preparing a Text Editor
Integrated Terminals
Summary
Chapter 2. Local Repositories
Current Setup
Introducing Repositories
Initializing a Local Repository
The Areas of Git
Adding a File to a Git Project
Summary
Chapter 3. Making a Commit
Current Setup
Why Do We Make Commits?
The Two Steps to Make a Commit
Viewing a List of Commits
Summary
Chapter 4. Branches
State of the Local Repository
Why Do We Use Branches?
Unmodified and Modified Files
Making Commits on a Branch
Creating a Branch
What Is HEAD?
Switching Branches
Working on a Separate Branch
Summary
Chapter 5. Merging
State of the Local Repository
Introducing Merging
Types of Merges
Doing a Fast-Forward Merge
Checking Out Commits
Creating a Branch and Switching onto It in One Go
Summary
Chapter 6. Hosting Services and Authentication
Hosting Services and Remote Repositories
Setting Up a Hosting Service Account
Setting Up Authentication Credentials
Summary
Chapter 7. Creating and Pushing to a Remote Repository
State of the Local Repository
The Two Ways to Start Work on a Git Project
The Interaction Between Local and Remote Repositories
Why Do We Use Remote Repositories?
Creating a Remote Repository with Data
Working on a Remote Repository Directly on a Hosting Service
Summary
Chapter 8. Cloning and Fetching
State of the Local and Remote Repositories
Cloning a Remote Repository
Deleting Branches
Git Collaboration and Branches
Incorporating Changes from the Remote Repository
Deleting Branches (Continued)
Summary
Chapter 9. Three-Way Merges
State of the Local and Remote Repositories
Why Are Three-Way Merges Important?
Setting Up a Three-Way Merge Scenario
Defining Upstream Branches
Editing the Same File Multiple Times Between Commits
Working at the Same Time as Others on Different Files
Three-Way Merge in Practice
Pulling Changes from a Remote Repository
State of the Local and Remote Repositories
Summary
Chapter 10. Merge Conflicts
State of the Local and Remote Repositories
Introducing Merge Conflicts
How to Resolve Merge Conflicts
Setting Up a Merge Conflict Scenario
The Merge Conflict Resolution Process
Resolving Merge Conflicts in Practice
Staying Up to Date with a Remote Repository
Syncing the Repositories
State of the Local and Remote Repositories
Summary
Chapter 11. Rebasing
State of the Local and Remote Repositories
Integrating Changes in Git
Why Is Rebasing Helpful?
Setting Up the Rebasing Example
Unstaging and Staging Files
Preparing to Rebase
The Five Stages of the Rebase Process
Rebasing and Merge Conflicts
Rebasing a Branch in Practice
The Golden Rule of Rebasing
Syncing the Repositories
State of the Local and Remote Repositories
Summary
Chapter 12. Pull Requests (Merge Requests)
State of the Local and Remote Repositories
Introducing Pull Requests
Hosting Service Specifics
Why Use Pull Requests?
Understanding How Pull Requests Are Merged
Preparing to Make a Pull Request
An Easier Way to Define Upstream Branches
Creating a Pull Request on a Hosting Service
Reviewing and Approving a Pull Request
Merging a Pull Request
Deleting Remote Branches
Syncing the Local Repositories and Cleaning Up
State of the Local and Remote Repositories
Summary
[ Epilogue ]
Appendix A: Chapter Prerequisites
Appendix B: Command Quick Reference
Appendix C: Visual Language Reference
[ Index ]
