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

Other recommendations


In this section, you would find the best practices and recommendations that do not fit cleanly in one of the areas described before, namely starting a project, working on a project, and integrating changes.

Don't panic, recovery is almost always possible

As long as you have committed your work, storing your changes in the repository, it will not be lost. It would only perhaps be misplaced. Git also tries to preserve your current un-committed (unsaved) work, but it cannot distinguish for example between the accidental and the conscious removing of all the changes to the working directory with git reset --hard. Therefore, you'd better commit or stash your current work before trying to recover lost commits.

Thanks to the reflog (both for the specific branch and for the HEAD ref), it is easy to undo most operations. Then, there is the list of stashed changes (see Chapter 4, Managing Your Worktree), where your changes might hide. And there is git fsck as the last resort. See...

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