Learning Git: A Hands-On and Visual Guide to the Basics of Git

PrefaceChapter 1. Git and the Command LineWhat Is Git?The Graphical User Interface and the Command LineOpening a Command Line WindowExecuting Commands in the Command LineInstalling GitCommand Options and ArgumentsClearing the Command LineOpening the Filesystem WindowWorking with DirectoriesClosing the Command LineSetting Git ConfigurationsPreparing a Text EditorIntegrated TerminalsSummaryChapter 2. Local RepositoriesCurrent SetupIntroducing RepositoriesInitializing a Local RepositoryThe Areas of GitAdding a File to a Git ProjectSummaryChapter 3. Making a CommitCurrent SetupWhy Do We Make Commits?The Two Steps to Make a CommitViewing a List of CommitsSummaryChapter 4. BranchesState of the Local RepositoryWhy Do We Use Branches?Unmodified and Modified FilesMaking Commits on a BranchCreating a BranchWhat Is HEAD?Switching BranchesWorking on a Separate BranchSummaryChapter 5. MergingState of the Local RepositoryIntroducing MergingTypes of MergesDoing a Fast-Forward MergeChecking Out CommitsCreating a Branch and Switching onto It in One GoSummaryChapter 6. Hosting Services and AuthenticationHosting Services and Remote RepositoriesSetting Up a Hosting Service AccountSetting Up Authentication CredentialsSummaryChapter 7. Creating and Pushing to a Remote RepositoryState of the Local RepositoryThe Two Ways to Start Work on a Git ProjectThe Interaction Between Local and Remote RepositoriesWhy Do We Use Remote Repositories?Creating a Remote Repository with DataWorking on a Remote Repository Directly on a Hosting ServiceSummaryChapter 8. Cloning and FetchingState of the Local and Remote RepositoriesCloning a Remote RepositoryDeleting BranchesGit Collaboration and BranchesIncorporating Changes from the Remote RepositoryDeleting Branches (Continued)SummaryChapter 9. Three-Way MergesState of the Local and Remote RepositoriesWhy Are Three-Way Merges Important?Setting Up a Three-Way Merge ScenarioDefining Upstream BranchesEditing the Same File Multiple Times Between CommitsWorking at the Same Time as Others on Different FilesThree-Way Merge in PracticePulling Changes from a Remote RepositoryState of the Local and Remote RepositoriesSummaryChapter 10. Merge ConflictsState of the Local and Remote RepositoriesIntroducing Merge ConflictsHow to Resolve Merge ConflictsSetting Up a Merge Conflict ScenarioThe Merge Conflict Resolution ProcessResolving Merge Conflicts in PracticeStaying Up to Date with a Remote RepositorySyncing the RepositoriesState of the Local and Remote RepositoriesSummaryChapter 11. RebasingState of the Local and Remote RepositoriesIntegrating Changes in GitWhy Is Rebasing Helpful?Setting Up the Rebasing ExampleUnstaging and Staging FilesPreparing to RebaseThe Five Stages of the Rebase ProcessRebasing and Merge ConflictsRebasing a Branch in PracticeThe Golden Rule of RebasingSyncing the RepositoriesState of the Local and Remote RepositoriesSummaryChapter 12. Pull Requests (Merge Requests)State of the Local and Remote RepositoriesIntroducing Pull RequestsHosting Service SpecificsWhy Use Pull Requests?Understanding How Pull Requests Are MergedPreparing to Make a Pull RequestAn Easier Way to Define Upstream BranchesCreating a Pull Request on a Hosting ServiceReviewing and Approving a Pull RequestMerging a Pull RequestDeleting Remote BranchesSyncing the Local Repositories and Cleaning UpState of the Local and Remote RepositoriesSummaryEpilogueAppendix A: Chapter PrerequisitesAppendix B: Command Quick ReferenceAppendix C: Visual Language ReferenceIndex