Book Image

Git Version Control Cookbook - Second Edition

By : Kenneth Geisshirt, Emanuele Zattin(EUR), Aske Olsson, Rasmus Voss
Book Image

Git Version Control Cookbook - Second Edition

By: Kenneth Geisshirt, Emanuele Zattin(EUR), Aske Olsson, Rasmus Voss

Overview of this book

Git is one of the most popular tools for versioning. With over 100 practical, self-contained tutorials, this updated version of the bestselling Git Version Control Cookbook examines the common pain points and best practices to help you solve problems related to versioning. Each recipe addresses a specific problem and offers a proven, best-practice solution with insights into how it works. You’ll get started by learning about the Git data model and how it stores files, along with gaining insights on how to commit changes to a database. Using simple commands, you’ll also understand how to navigate through the database. Once you have accustomed yourself to the basics, you’ll explore techniques to configure Git with the help of comprehensive examples and configuration targets. Further into the book, you’ll get up to speed with branches and recovery from mistakes. You’ll also discover the features of Git rebase and how to use regular Git to merge other branches. The later chapters will guide you in exploring Git notes and learning to utilize the update, list, and search commands. Toward the concluding chapters, you’ll focus on repository maintenance, patching, and offline sharing. By the end of this book, you’ll have grasped various tips and tricks, and have a practical understanding of best-practice solutions for common problems related to versioning.
Table of Contents (19 chapters)
Title Page
Copyright and Credits
Packt Upsell
Contributors
Preface
Index

Introduction


It is possible to correct mistakes made in Git with git pushcontext (without exposing them if the mistake is found before sharing or publishing the change). If the mistake has already been pushed, it is still possible to undo the changes made to the commit that introduced the mistake.

We will look at the reflog command and how we can use that and git fsckto recover lost information.

There is no git undocommand in core Git, one of the reasons being ambiguity on what needs to be undone, for example, and the last commit, the added file. If you want to undo the last commit, how should that be done? Should the changes introduced to the files by the commit be deleted? For instance, do you just roll back to the last known good commit, or should they be kept so that it could be changed for a better commit? Should the commit message simply be reworded? In this chapter, we'll explore the possibilities for undoing a commit in several ways, depending on what we want to achieve. We'll explore...