Skip to main content
Better Git Started:
An Introduction to the Command Line, GitHub, and Git
Ian Curtis
Contents
Index
Search Book
close
Search Results:
No results.
Prev
Up
Next
\(\newcommand{\N}{\mathbb N} \newcommand{\Z}{\mathbb Z} \newcommand{\Q}{\mathbb Q} \newcommand{\R}{\mathbb R} \newcommand{\lt}{<} \newcommand{\gt}{>} \newcommand{\amp}{&} \definecolor{fillinmathshade}{gray}{0.9} \newcommand{\fillinmath}[1]{\mathchoice{\colorbox{fillinmathshade}{$\displaystyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\textstyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\scriptstyle \phantom{\,#1\,}$}}{\colorbox{fillinmathshade}{$\scriptscriptstyle\phantom{\,#1\,}$}}} \)
Front Matter
Colophon
Dedication
Acknowledgements
Publisher’s Note
How To Use This Book
Materials: Windows
Materials: Mac
Materials: Linux
I
Introductory Information
1
Computer Basics
1.1
File and Folder Names
1.1.1
Naming Conventions
1.1.2
Exploring File and Folder Naming Techniques
1.2
File Extensions
1.2.1
Images
1.2.2
Videos
1.2.3
Documents
1.2.4
Audio
1.2.5
Coding and Programming
1.2.6
Data
1.2.7
Other File Exensions
1.3
File Paths
1.3.1
Constructing File Paths
1.3.2
Hints and Reminders
2
The Command Line
2.1
What is the Command Line?
2.2
Where is the Command Line?
2.2.1
On a Mac
2.2.2
On Windows
2.2.3
On Linux
2.3
Basic Commands
2.3.1
What is a Command?
2.3.2
Navigating Your Computer With the Command Line
2.3.3
Adding Files and Directories
2.3.4
Removing Files and Directories
2.4
Advanced Commands
II
Working Solo
3
GitHub Solo
3.1
Navigating GitHub
3.1.1
Creating A GitHub Account
3.1.2
The Profile Page
3.1.3
Settings and Customizations
3.2
The First Repository and File
3.2.1
Creating a Repository
3.2.2
Exploring the Code Tab
3.2.3
Editing a File
3.3
Working With Branches
3.3.1
Thinking About Branches
3.3.2
Creating a Branch
3.3.3
Working On a Branch
3.3.4
Creating a Pull Request (with Yourself)
4
Git Solo
4.1
Getting Set Up with Git
4.1.1
Cloning a Repository
4.1.2
Branches With Git
4.2
Editing Files
4.3
Sending Changes Back To GitHub: The Three-Step Process
4.3.1
Wait, Which Files Did I Change Again?
4.3.2
Step 1: Staging Files
4.3.3
Step 2: Committing Files
4.3.4
Step 3: Pushing Files
4.4
The Final Steps
4.5
Summary
4.6
Working Solo: The Culminating Experience
III
Working With Others
5
GitHub Collaboration
5.1
Before Beginning, Consider This
5.2
Getting Set Up To Collaborate
5.2.1
Forking
5.3
Editing
5.4
Fetching Upstream
5.4.1
First, Fetching
5.4.2
Second, Upstream
5.4.3
Third, Fetching Upstream
6
Git Collaboration
6.1
Getting Set Up: A Few Extra Steps
6.1.1
Cloning A Fork
6.1.2
Don’t Forget About Branches!
6.2
Collaboration Editing With Git
6.3
Revisiting the Three Step Process
6.3.1
Staging Files
6.3.2
Committing Files
6.3.3
Pushing Files
6.4
The Final Steps
6.4.1
Opening a Pull Request
6.4.2
Pulling/Fetching Upstream
6.5
Summary
6.6
Working Together: The Culminating Experience
Backmatter
A
Customizing the Terminal
A.1
For Mac Users
A.1.1
A New Terminal: iTerm2
A.1.2
A New Shell:
fish
A.2
For Windows Users (*)
A.3
For Linux Users (*)
A.3.1
A New Shell:
fish
A.4
For All
A.4.1
A New Git Interface
A.4.2
GitHub Desktop
A.4.3
Understanding Version Control: Git Lens
B
Extra GitHub Content
B.1
The Issues Tab
B.2
Commit History
B.3
The About Panel
B.4
The Branch Tree Diagram (Network Graph)
B.5
Codespaces
B.6
Deleting a Repository
B.7
The
.gitignore
File
C
Common Git Troubles and How To Fix Them
C.1
Uh Oh, I Staged the Wrong Files!
C.2
Uh Oh, I Committed Too Early!
C.3
Git Has Been Updating Files, But Now I Don’t Want It To
C.4
Git Won’t Let Me Pull From Upstream or Origin!
C.4.1
Your Local Changes Are Irrelevant and You Want Them Overwritten
C.4.2
Your Local Changes are Good and You Want to Keep Them
C.5
Git Says I Have Divergent Branches!
C.6
Reverting To a Previous Commit
C.7
Merge Conflicts
D
Common Commands
D.1
General Commands
D.2
Git Commands
E
Answers to All Activities and Exercises
Index
Colophon
Dedication
Dedication
To my family, who didn’t even know I was writing a book and who was very surprised when I said I finished it.
