In this module, you will get hands-on experience working with Git and its advanced concepts.

DevOps for Developers

Git is one of the most widely used version control tools, and is something that every developer should become comfortable with. In this module, you will get hands-on experience working with Git so that when it comes time to use it, you’ll be ready.

You’ll start by learning some of the more fundamental concepts such as initializing a Git repository, adding files to a repository, and how to commit changes. You’ll also learn how to clone a repository, and how to create branching.

You’ll then make your way to some more advanced concepts like Git stash, cherry-picking, working with multiple repositories, pushing code, and a lot more.

By the end of this module, you will have a proficient and working knowledge of Git which will serve you well throughout your career.

Git and GitHub

You may or may not remember that you covered the `git cherry-pick` command [previously](https://www.educative.io/courses/learn-git-hard-way/introduction-cherry-picking). At the time, I skated over some detail that I think you're ready for now.

In this chapter, you will cover:

- The `git cherry-pick` command (again)
- Why `cherry-pick` might not do what you expect
- The `git diff-tree` and `git apply` commands
- What a “three-way merge” is

By the end, you'll understand the cherry-pick command much more clearly and why and how you can get more surgical with your application of diffs from individual commits.

Before We Begin

Introduction to Git

Git Basics

Clone a Repository

Git Branching

Merging

Git Stash

Git Add Interactive

Reflog

Cherry Picking

Git Rebase

Git Bisect

Fetching and Pulling Content

Working With Multiple Repositories

Pushing Code

Git Submodules

Pull Requests

Git Log

Squashing Commits

Bare Repositories

Cherry-Picking and Three-Way Merges

Git Hooks

Conclusion

Introduction: Cherry-Picking and Three-Way Merges