New Course: Mastering Git
- Video 1: Implementation of Git (Free!)
- Video 2: Merge Conflicts
- Video 3: Stashes
- Video 4: Aliases
- Video 5: Rebase: A Merge Alternative
- Video 6: Rebase: Rewriting History (Free!)
- Video 7: Gitignore After the Fact
- Video 8: Cherry Picking
- Video 9: Filter Branch
- Video 10: Many Faces of Undo
- Video 11: GUIs: Gitk
- Video 12: GUIs: SourceTree
- Video 13: GUIs: GitUp
- Video 14: Conclusion
- Where To Go From Here?
Git is an incredibly powerful platform-agnostic tool. In the Beginning Git video series you learnt the basics around how and why to use Git. If you haven’t seen that series, it comes highly recommended. Even if you think you know Git, give it a watch—there’s almost certainly some content in there that you don’t know about.
In this 14-part Mastering Git course, you’ll take the solid foundation laid by the Beginning Git course, and build upon it. You’ll focus on fixing real-world problems, as you take a multi-user Git repository and work through the final steps of releasing a software product. You’ll also find out what Git GUIs have to offer, and take a tour of several popular options.
Let’s take a look at what’s inside:
Video 1: Implementation of Git (Free!)
If you’ve been using Git for a while, you might be wondering how it actually works. In the first video of the Mastering Git video course, you’ll discover how Git is built on top of a simple key-value store-based file system, and what power this provides to you.
Video 2: Merge Conflicts
In the Beginning Git video series, you discovered how powerful the branch-and-merge paradigm is. But merging isn’t always as simple as it might first appear. In this video you will learn how to handle merge conflicts—which occur when Git cannot work out how to automatically combine changes.
Video 3: Stashes
Git stashes offer a great way for you to create a temporary snapshot of what you’re working on, without having to create a full-blown commit. Discover when that might be useful, and how to go about it.
Video 4: Aliases
Do you ever find yourself typing out the same long Git commands repeatedly? Well, now there’s another way. Git aliases allow you to create new Git commands that can streamline your workflow.
Video 5: Rebase: A Merge Alternative
Rebasing is often thought of as a mystical and complex tool. This video will demystify one of the primary uses of Git rebase—integrating branches without merge commits.
Video 6: Rebase: Rewriting History (Free!)
Rebase is a whole lot more powerful than just as a replacement for merge. It offers the ability to completely rewrite the history of your Git repo. Discover how in this action-packed video.
Video 7: Gitignore After the Fact
Gitignore is easy right? If you’ve been using it for a while you’ll know that isn’t always true. Discover how you can fix problems with gitignore such as handling files that have been accidentally committed to the repository.
Video 8: Cherry Picking
Cherry picking provides a way to grab single commits from other branches, and apply them to your own branch. Learn how to achieve this, and why you might want to in the next video in the Mastering Git video course.
Video 9: Filter Branch
Interactive rebase allows you to rewrite history one commit at a time. But what if you want to automate that? In this video you’ll see how you can use the filter-branch tool to programmatically rewrite history—kinda like a nerdy time traveller.
Video 10: Many Faces of Undo
One of the common questions associated with git is “how can I get out of this mess?”. In this video you’ll learn about the different “undo” commands that git provides—what they are and when to use them.
Video 11: GUIs: Gitk
In the first of three videos about GUIs for Git, you’ll take a look at Gitk and GitGUI—two simple tools that are distributed with Git itself.
Video 12: GUIs: SourceTree
Next up on the whistlestop tour of popular Git GUIs is SourceTree. Learn how to get started with SourceTree, and some of the top tools it offers.
Video 13: GUIs: GitUp
And finally, it’s GitUp—objectively the best Git GUI there is. Find out why as we take a quick tour of how to get started with GitUp.
Video 14: Conclusion
A quick summary of what you’ve learnt throughout this Mastering Git video course. Remember that Git is a tool that you can use irrespective of your chosen platform, but that it is very much a tool.
Where To Go From Here?
Want to check out the course? You can watch two of the videos for free:
- Video 1: Implementation of Git is available today.
- Video 6: Rebase: Rewriting History will be released later this week.
The rest of the course is for raywenderlich.com subscribers only. Here’s how you can get access:
- If you are a raywenderlich.com subscriber: You can access the first two parts of Mastering Git. today, and the rest will be coming out over the next two weeks.
- If you are not a subscriber yet: What are you waiting for? Subscribe now to get access to our new Mastering Git course and our entire catalog of over 500 videos.
There’s much more in store for raywenderlich.com subscribers – if you’re curious, you can check out our full schedule of upcoming courses.
I hope you enjoy our new course, and stay tuned for many more new courses and updates to come! :]