Book Image

Git for Programmers

By : Jesse Liberty
Book Image

Git for Programmers

By: Jesse Liberty

Overview of this book

Whether you’re looking for a book to deepen your understanding of Git or a refresher, this book is the ultimate guide to Git. Git for Programmers comprehensively equips you with actionable insights on advanced Git concepts in an engaging and straightforward way. As you progress through the chapters, you’ll gain expertise (and confidence) on Git with lots of practical use cases. After a quick refresher on git history and installation, you’ll dive straight into the creation and cloning of your repository. You’ll explore Git places, branching, and GUIs to get familiar with the fundamentals. Then you’ll learn how to handle merge conflicts, rebase, amend, interactive rebase, and use the log, as well as explore important Git commands for managing your repository. The troubleshooting part of this Git book will include detailed instructions on how to bisect, blame, and several other problem handling techniques that will complete your newly acquired Git arsenal. By the end of this book, you’ll be using Git with confidence. Saving, sharing, managing files as well as undoing mistakes and basically rewriting history will be a breeze.
Table of Contents (16 chapters)
11
Finding a Broken Commit: Bisect and Blame
13
Next Steps
14
Other Books You May Enjoy
15
Index

Interactive rebasing at work

To see this at work, we need a dozen commits. Let's create a new quick and dirty program and create commits with every line. Once we have that, we can look at how interactive rebasing is accomplished at the command line and also in Visual Studio.

Note: you would never commit this frequently, but we need commits to work with.

Creating our example

For variety's sake, let's create the skeleton of a music tracking application. The first step is to create the repository on GitHub:

Figure 6.1: Creating a repository

With the repository created, we need to clone it into a local repository. This time let's use Visual Studio, and GitHub's awareness of Visual Studio. On GitHub click on Code and when the dropdown opens, choose Open with Visual Studio:

Figure 6.2: Downloading a commit with Visual Studio

When you do, Visual Studio will open and offer to save your project, with the name and default...