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

You need to undo changes made in a commit

All you need to do here is to call the log, get the ObjectID of the commit you want to undo and call:

git revert ObjectID

Let's go back to the log:

Figure 12.3: Log, starting point

Now let's revert the commit that added the hello message:

git revert c507abf

Because I reverted a change in the middle of the branch, it's no surprise that I run into a merge conflict:

Figure 12.4: Merge conflict

To solve this I will call git mergetool, invoking the tool I set up in Chapter 4, Merging, Pull Requests, and Handling Merge Conflicts. Kdiff3 is smart enough to fix all the conflicts without my help:

Figure 12.5: Kdiff3 fixes the conflicts for me

Sure enough, when we open Program.cs the Hello World is gone:

Figure 12.6: Program.cs after revert