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
Mastering Git

You're reading from  Mastering Git

Product type Book
Published in Apr 2016
Publisher Packt
ISBN-13 9781783553754
Pages 418 pages
Edition 1st Edition
Languages
Toc

Table of Contents (19) Chapters close

Mastering Git
Credits
About the Author
About the Reviewer
www.PacktPub.com
Preface
1. Git Basics in Practice 2. Exploring Project History 3. Developing with Git 4. Managing Your Worktree 5. Collaborative Development with Git 6. Advanced Branching Techniques 7. Merging Changes Together 8. Keeping History Clean 9. Managing Subprojects – Building a Living Framework 10. Customizing and Extending Git 11. Git Administration 12. Git Best Practices Index

Amending history without rewriting


What to do if what you need to fix is in the published part of the history? As described in Perils of rewriting published history section, changing the parts of the history that were made public (which is actually creating a changed copy and replacing references) can cause problems for downstream developers. You better not to touch this part of the graph of revisions.

There are a few solutions to this problem. The most commonly used is to put a new fixup commit with appropriate changes (for example, a typo fix in a documentation). If you need to remove changes, deciding that they turned out to be bad to have, you can create a commit to revert the changes.

If you fix a commit or revert one, it would be nice to annotate that commit with the information that it was buggy, and which commit fixed (or reverted) it. Even though you cannot (should not) edit the fixed commit to add this information if the commit is public, Git provides a notes mechanism to append...

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