Search icon CANCEL
Subscription
0
Cart icon
Cart
Close icon
You have no products in your basket yet
Save more on your purchases!
Savings automatically calculated. No voucher code required
Arrow left icon
All Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Newsletters
Free Learning
Arrow right icon
Arrow up icon
GO TO TOP
Git for Programmers

You're reading from  Git for Programmers

Product type Book
Published in Jun 2021
Publisher Packt
ISBN-13 9781801075732
Pages 264 pages
Edition 1st Edition
Languages
Author (1):
Jesse Liberty Jesse Liberty
Profile icon Jesse Liberty
Toc

Table of Contents (16) Chapters close

Preface 1. Introduction 2. Creating Your Repository 3. Branching, Places, and GUIs 4. Merging, Pull Requests, and Handling Merge Conflicts 5. Rebasing, Amend, and Cherry-Picking 6. Interactive Rebasing 7. Workflow, Notes, and Tags 8. Aliases 9. Using the Log 10. Important Git Commands and Metadata 11. Finding a Broken Commit: Bisect and Blame 12. Fixing Mistakes 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

lock icon The rest of the chapter is locked
Register for a free Packt account to unlock a world of extra content!
A free Packt account unlocks extra newsletters, articles, discounted offers, and much more. Start advancing your knowledge today.
Unlock this book and the full library FREE for 7 days
Get unlimited access to 7000+ expert-authored eBooks and videos courses covering every tech area you can think of
Renews at $15.99/month. Cancel anytime