Collaborating with Git

Video description

If you’ve previously tried to learn Git but found the structure of the materials to be opaque, too academic, or just plain confusing, this hands-on video course will help you complete the task. Author and educator Emma Jane Hogbin Westby takes an unconventional approach to teaching version control with Git. Rather than start with the commands you’ll be running, she first explains why—and then demonstrates how.

Along the way, you’ll learn several Git …

Collaborating with Git

Video description

Along the way, you’ll learn several Git hacks to help you be more efficient. And that means navigating Git from the command line. Many people prefer the “convenience” of a GUI, but in the long run, learning commands is quicker and easier than clicking various buttons on a succession of screens.

Create a visual map of Git by sketching your own diagrams
Use an example project to get started with hosted Git repositories
Learn how to upload changes and merge work with branches
Work with tags to pinpoint specific commits in the history of your work
Find and fix bugs by comparing “working” and “non-working” states
Learn how to undo your work with rollbacks and resets
Clean up your commit history with rebase
Move your sample project from GitLab to GitHub
Learn how to collaborate on GitHub and BitBucket

Emma Jane Hogbin Westby has been working as a web developer since 1996 and has been participating in FOSS communities for over a decade. Having written two Drupal books, including Front End Drupal (Prentice Hall), she has been teaching web-based technologies online and in person for over a decade.

Publisher resources

View/Submit Errata

Welcome and Set Up/Warm-up Exercise

Getting Started with Hosted Git Repositories

Creating a GitLab Account

Adding Your SSH Keys

Forking Your First Project

Privatizing Your Repository

Overview of Permission Strategies

Downloading a Remote Repository

Cloning your GitLab Repository

Reviewing History with Git Log

Configuring Git

Identifying Yourself

Changing the Commit Message Editor

Adding Color

Getting Started as a Team of One

Initializing an Empty Project

Converting an Existing Project to Git

Connecting to Remote Repositories

Copying a Repository

Cloning a Local Repository

Converting a Set of Files to a Repository

Adding Another Remote Connection

Working with Branches

Listing All Branches

Using a Different Branch

Establishing Your Branching Strategy

Creating a Topic Branch

Uploading Your Changes with Git Push

Accepting and Merging New Work

Dealing with Merge Conflicts

Working with Tags

Listing, Adding, and Deleting Tags

Checking Out Tags

Recovering from a Detached HEAD State

Sharing Tags

Finding and Fixing Bugs

Finding Relative History with Git Log

Finding the Last Working State with Bisect

Finding the Author History of a File with Blame

Using Stash to Work on an Emergency Bug Fix

Rollbacks, Resets, and Undoing Your Work

Using Branches for Experimental Work

Amending a Commit

Removing Changes to the Working Directory

Removing Commits with Reset

Promoting a Previous Commit with Revert

Rewiring History with Rebase

Bringing Your Work Up-to-Date with Rebase

Using Rebase to Combine Serveral Commits

Using Rebase to Truncate a Branch Before Merging

Combining Your Changes Into Another Branch with Rebase

Changing Previous Commits with Interactive Rebase

Collaborating on GitHub

Creating an Account - GitHub

Importing a Repository - BitBucket

Forking a Repository

Making Changes to Your Fork

Making Quicker Changes with the Web UI

Tracking Your Changes with Issues

Accepting a Pull Request

Importing a Repository - GitHub

Extending GitHub with Hub

Collaborating on BitBucket

Creating an Account - BitBucket

Making Changes to Your Repository

Tracking Your Changes with Issues

Accepting a Pull Request

Start your Free Trial

Self paced

Go to the Course
We have partnered with providers to bring you collection of courses, When you buy through links on our site, we may earn an affiliate commission from provider.