Search icon CANCEL
Arrow left icon
Explore Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Conferences
Free Learning
Arrow right icon
Mastering Git
Mastering Git

Mastering Git: Attain expert-level proficiency with Git by mastering distributed version control features , Second Edition

Arrow left icon
Profile Icon Narębski
Arrow right icon
₹799.99 ₹2978.99
eBook Aug 2024 444 pages 2nd Edition
eBook
₹799.99 ₹2978.99
Paperback
₹3723.99
Subscription
Free Trial
Renews at ₹800p/m
Arrow left icon
Profile Icon Narębski
Arrow right icon
₹799.99 ₹2978.99
eBook Aug 2024 444 pages 2nd Edition
eBook
₹799.99 ₹2978.99
Paperback
₹3723.99
Subscription
Free Trial
Renews at ₹800p/m
eBook
₹799.99 ₹2978.99
Paperback
₹3723.99
Subscription
Free Trial
Renews at ₹800p/m

What do you get with eBook?

Product feature icon Instant access to your Digital eBook purchase
Product feature icon Download this book in EPUB and PDF formats
Product feature icon Access this title in our online reader with advanced features
Product feature icon DRM FREE - Read whenever, wherever and however you want
Product feature icon AI Assistant (beta) to help accelerate your learning
Table of content icon View table of contents Preview book icon Preview Book

Mastering Git

Git Basics in Practice

This book is intended for intermediate and advanced Git users to help them on their road to mastering Git. Therefore, the chapters following this one will assume you know the basics of Git, and have advanced past the beginner stage.

This chapter will serve as a reminder of version control basics with Git. The focus will be on providing practical aspects of the technology, showing and explaining basic version control operations on the example of the development of an example project, and the collaboration between two developers.

In this chapter, we will cover the following:

  • A brief introduction to version control and Git
  • Setting up a Git environment and Git repository (init and clone)
  • Adding files, checking status, creating commits, and examining the history
  • Interacting with other Git repositories (pull and push)
  • Creating and listing branches, switching to a branch, and merging changes
  • Resolving a simple merge conflict
  • Creating...

Technical requirements

To follow the examples shown in this chapter, you will need Git: https://git-scm.com/. You will also need an interactive shell (for example, Git Bash if you are using MS Windows), a text editor or an IDE for web development (for editing JavaScript and HTML), and a web browser.

You can access the code of an example project used in this chapter at the following URLs: https://github.com/PacktPublishing/Mastering-Git---Second-Edition/tree/main/chapter01 and https://github.com/jnareb/Mastering-Git---Second-Edition---chapter01-sample_project.

A brief introduction to version control and Git

A version control system (sometimes called revision control) is a tool that lets you track the history and attribution of your project files over time (stored in a repository) and helps the developers in the team to work together. Modern version control systems give each developer their own sandbox, preventing their work in progress from conflicting, and all the while providing a mechanism to merge changes and synchronize work. They also allow us to switch between different lines of development, called branches; this mechanism allows the developer to change, for example, from working on introducing a new feature step by step to fixing the bug in an older, released version of the project.

Distributed version control systems (such as Git) give each developer their own copy of the project’s history, which is called a clone of a repository. This is what makes Git fast, because nearly all operations are performed locally. It is also...

Git by example

Let’s follow a step-by-step, section-by-section, simple example of two developers using Git to work together on a simple project. You can find all three repositories (for two developers, and the bare server repository) with the example code files for this chapter, where you can examine the code, history, and reflog, at https://github.com/PacktPublishing/Mastering-Git---Second-Edition, in a sample_project.zip archive.

Following the example

To follow this example of the team development process on a single computer, you can simply create three folders called, for example, alice/, bob/, and server/, and switch to the appropriate folder when following work done by Alice, Bob, and Carol, respectively.

There are a few simple changes you need to make for this simulation to work. When creating a repository as Carol, you don’t need to create and switch to the /srv/git directory, so you can simply skip these commands. In Alice or Bob’s role, you need...

Summary

This chapter walked us through the process of working on a simple example project by a small development team.

We have recalled how to start working with Git, either by creating a new repository or by cloning an existing one. We have seen how to prepare a commit by adding, editing, moving, and renaming files, how to revert changes to the file, how to examine the current status and view changes to be committed, and how to tag a new release.

We have recalled how to use Git to work at the same time on the same project, how to make our work public, and how to get changes from other developers. Though using a version control system helps with simultaneous work, sometimes Git needs user input to resolve conflicts in work done by different developers. We have seen how to resolve a merge conflict.

We have recalled how to create a tag marking a release, and how to create a branch starting an independent line of development. Git requires tags and new branches to be pushed explicitly...

Questions

Answer the following questions to test your knowledge of this chapter:

  1. Describe how to create a repository from existing files and how to get your own copy of an existing repository.
  2. Describe how to create a new version of the project locally, and how to publish those changes.
  3. Explain how to get changes from other developers, and how to combine those changes.
  4. What do merge conflict markers look like, and how can you resolve a merge conflict?
  5. What can you do to make Git not show temporary backup files as unknown files in the status output? What about the products and byproducts of the build system?
  6. Where can you find information about how to undo adding a file, or how to undo changes to a file?
  7. How can you abandon the commit? What are the dangers of doing so?
  8. Explain how Git manages moving, copying, and renaming files.

Answers

Here are the answers to the questions given above:

  1. Use git init, git add ., and git commit to create a repository from existing files. Use git clone to get your own copy of the existing repository.
  2. Use git commit or git commit -a to create a new revision, and use git push to publish changes.
  3. Use git fetch to get updates from other developers, or git pull to get updates and merge them together. Use git merge (or, as mentioned in later chapters, git rebase) to combine changes.
  4. Merge conflicts are presented using the <<<<<<<, =======, and >>>>>>> markers; you can also find the ||||||| marker used, depending on the configuration. To resolve the conflicts, you need to edit files marked as conflicting into shape, use git add on them when finished, and then finalize the merge with git commit or git merge --continue (or rebase with git rebase --continue).
  5. To make Git ignore specific types of files, you need to add appropriate...

Further reading

If you need a reminder about Git basics, the following references might help you.

Left arrow icon Right arrow icon
Download code icon Download Code

Key benefits

  • Set up Git for solo and collaborative development as well as for code, documentation, configuration, or data
  • Leverage the Git version control system to customize and extend existing recipes, and write your own
  • Discover how to efficiently manage large and complex repositories
  • Purchase of the print or Kindle book includes a free PDF eBook

Description

Developers often feel overwhelmed by complex version control issues, especially when managing large repositories. This updated second edition of our Git guide empowers you to tackle these challenges head-on and emerge as a Git pro. The book gets you up to speed with the latest Git version, its features, and advanced branching techniques, helping you master complex development scenarios. A new chapter on tackling challenges while managing large repositories has been added, providing invaluable strategies for efficient version control with Git. The book goes beyond the basics to take you through Git’s architecture, behavior, and best practices in depth. The chapters help you develop a clear understanding of customizing workflows, creating unique solutions, and tackling any version control hurdle. As you advance, you’ll explore a wide range of functionalities, from examining project history to collaborating seamlessly with teammates. Detailed descriptions guide you through managing your work, collaborating with others, administering Git, and navigating project history. By the end of this book, you’ll have become a Git pro and be confident enough to handle advanced branching, manage large repositories, customize workflows, collaborate effectively, and troubleshoot any version control issues.

Who is this book for?

This book is for developers looking to elevate their Git skills beyond the basics. Whether you're a seasoned developer or just getting started with version control, this book will help you leverage Git for efficient collaboration, code management, and improved workflows. The book also equips DevOps professionals with the knowledge they need to configure Git for seamless integration within DevOps workflows, enabling smoother collaboration between development and operations teams.

What you will learn

  • Explore project history and find revisions using different criteria
  • Manage your working directory and staging area
  • Set up repositories and branches for collaboration
  • Configure and set up support for the chosen workflow
  • Submit your own contributions and integrate contributions made by others
  • Customize Git behavior system-wide, from per-user to per-file basis
  • Perform Git administration to set up and manage repositories

Product Details

Country selected
Publication date, Length, Edition, Language, ISBN-13
Publication date : Aug 23, 2024
Length: 444 pages
Edition : 2nd
Language : English
ISBN-13 : 9781835080054
Concepts :
Tools :

What do you get with eBook?

Product feature icon Instant access to your Digital eBook purchase
Product feature icon Download this book in EPUB and PDF formats
Product feature icon Access this title in our online reader with advanced features
Product feature icon DRM FREE - Read whenever, wherever and however you want
Product feature icon AI Assistant (beta) to help accelerate your learning

Product Details

Publication date : Aug 23, 2024
Length: 444 pages
Edition : 2nd
Language : English
ISBN-13 : 9781835080054
Concepts :
Tools :

Packt Subscriptions

See our plans and pricing
Modal Close icon
₹800 billed monthly
Feature tick icon Unlimited access to Packt's library of 7,000+ practical books and videos
Feature tick icon Constantly refreshed with 50+ new titles a month
Feature tick icon Exclusive Early access to books as they're written
Feature tick icon Solve problems while you work with advanced search and reference features
Feature tick icon Offline reading on the mobile app
Feature tick icon Simple pricing, no contract
₹4500 billed annually
Feature tick icon Unlimited access to Packt's library of 7,000+ practical books and videos
Feature tick icon Constantly refreshed with 50+ new titles a month
Feature tick icon Exclusive Early access to books as they're written
Feature tick icon Solve problems while you work with advanced search and reference features
Feature tick icon Offline reading on the mobile app
Feature tick icon Choose a DRM-free eBook or Video every month to keep
Feature tick icon PLUS own as many other DRM-free eBooks or Videos as you like for just ₹400 each
Feature tick icon Exclusive print discounts
₹5000 billed in 18 months
Feature tick icon Unlimited access to Packt's library of 7,000+ practical books and videos
Feature tick icon Constantly refreshed with 50+ new titles a month
Feature tick icon Exclusive Early access to books as they're written
Feature tick icon Solve problems while you work with advanced search and reference features
Feature tick icon Offline reading on the mobile app
Feature tick icon Choose a DRM-free eBook or Video every month to keep
Feature tick icon PLUS own as many other DRM-free eBooks or Videos as you like for just ₹400 each
Feature tick icon Exclusive print discounts

Frequently bought together


Stars icon
Total 8,936.97 11,172.97 2,236.00 saved
Mastering Git
₹3723.99
Implementing GitOps with Kubernetes
₹2345.99 ₹3351.99
Kubernetes – An Enterprise Guide
₹2866.99 ₹4096.99
Total 8,936.97 11,172.97 2,236.00 saved Stars icon

Table of Contents

20 Chapters
Part 1 - Exploring Project History and Managing Your Own Work Chevron down icon Chevron up icon
Chapter 1: Git Basics in Practice Chevron down icon Chevron up icon
Chapter 2: Developing with Git Chevron down icon Chevron up icon
Chapter 3: Managing Your Worktrees Chevron down icon Chevron up icon
Chapter 4: Exploring Project History Chevron down icon Chevron up icon
Chapter 5: Searching Through the Repository Chevron down icon Chevron up icon
Part 2 - Working with Other Developers Chevron down icon Chevron up icon
Chapter 6: Collaborative Development with Git Chevron down icon Chevron up icon
Chapter 7: Publishing Your Changes Chevron down icon Chevron up icon
Chapter 8: Advanced Branching Techniques Chevron down icon Chevron up icon
Chapter 9: Merging Changes Together Chevron down icon Chevron up icon
Chapter 10: Keeping History Clean Chevron down icon Chevron up icon
Part 3 - Managing, Configuring, and Extending Git Chevron down icon Chevron up icon
Chapter 11: Managing Subprojects Chevron down icon Chevron up icon
Chapter 12: Managing Large Repositories Chevron down icon Chevron up icon
Chapter 13: Customizing and Extending Git Chevron down icon Chevron up icon
Chapter 14: Git Administration Chevron down icon Chevron up icon
Chapter 15: Git Best Practices Chevron down icon Chevron up icon
Index Chevron down icon Chevron up icon
Other Books You May Enjoy Chevron down icon Chevron up icon
Get free access to Packt library with over 7500+ books and video courses for 7 days!
Start Free Trial

FAQs

How do I buy and download an eBook? Chevron down icon Chevron up icon

Where there is an eBook version of a title available, you can buy it from the book details for that title. Add either the standalone eBook or the eBook and print book bundle to your shopping cart. Your eBook will show in your cart as a product on its own. After completing checkout and payment in the normal way, you will receive your receipt on the screen containing a link to a personalised PDF download file. This link will remain active for 30 days. You can download backup copies of the file by logging in to your account at any time.

If you already have Adobe reader installed, then clicking on the link will download and open the PDF file directly. If you don't, then save the PDF file on your machine and download the Reader to view it.

Please Note: Packt eBooks are non-returnable and non-refundable.

Packt eBook and Licensing When you buy an eBook from Packt Publishing, completing your purchase means you accept the terms of our licence agreement. Please read the full text of the agreement. In it we have tried to balance the need for the ebook to be usable for you the reader with our needs to protect the rights of us as Publishers and of our authors. In summary, the agreement says:

  • You may make copies of your eBook for your own use onto any machine
  • You may not pass copies of the eBook on to anyone else
How can I make a purchase on your website? Chevron down icon Chevron up icon

If you want to purchase a video course, eBook or Bundle (Print+eBook) please follow below steps:

  1. Register on our website using your email address and the password.
  2. Search for the title by name or ISBN using the search option.
  3. Select the title you want to purchase.
  4. Choose the format you wish to purchase the title in; if you order the Print Book, you get a free eBook copy of the same title. 
  5. Proceed with the checkout process (payment to be made using Credit Card, Debit Cart, or PayPal)
Where can I access support around an eBook? Chevron down icon Chevron up icon
  • If you experience a problem with using or installing Adobe Reader, the contact Adobe directly.
  • To view the errata for the book, see www.packtpub.com/support and view the pages for the title you have.
  • To view your account details or to download a new copy of the book go to www.packtpub.com/account
  • To contact us directly if a problem is not resolved, use www.packtpub.com/contact-us
What eBook formats do Packt support? Chevron down icon Chevron up icon

Our eBooks are currently available in a variety of formats such as PDF and ePubs. In the future, this may well change with trends and development in technology, but please note that our PDFs are not Adobe eBook Reader format, which has greater restrictions on security.

You will need to use Adobe Reader v9 or later in order to read Packt's PDF eBooks.

What are the benefits of eBooks? Chevron down icon Chevron up icon
  • You can get the information you need immediately
  • You can easily take them with you on a laptop
  • You can download them an unlimited number of times
  • You can print them out
  • They are copy-paste enabled
  • They are searchable
  • There is no password protection
  • They are lower price than print
  • They save resources and space
What is an eBook? Chevron down icon Chevron up icon

Packt eBooks are a complete electronic version of the print edition, available in PDF and ePub formats. Every piece of content down to the page numbering is the same. Because we save the costs of printing and shipping the book to you, we are able to offer eBooks at a lower cost than print editions.

When you have purchased an eBook, simply login to your account and click on the link in Your Download Area. We recommend you saving the file to your hard drive before opening it.

For optimal viewing of our eBooks, we recommend you download and install the free Adobe Reader version 9.