Search icon CANCEL
Subscription
0
Cart icon
Your Cart (0 item)
Close icon
You have no products in your basket yet
Arrow left icon
Explore Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Free Learning
Arrow right icon
Git Best Practices Guide
Git Best Practices Guide

Git Best Practices Guide: Master the best practices of Git with the help of real-time scenarios to maximize team efficiency and workflow

eBook
€11.99 €17.99
Paperback
€22.99
Subscription
Free Trial
Renews at €18.99p/m

What do you get with a Packt Subscription?

Free for first 7 days. $19.99 p/m after that. Cancel any time!
Product feature icon Unlimited ad-free access to the largest independent learning library in tech. Access this title and thousands more!
Product feature icon 50+ new titles added per month, including many first-to-market concepts and exclusive early access to books as they are being written.
Product feature icon Innovative learning tools, including AI book assistants, code context explainers, and text-to-speech.
Product feature icon Thousands of reference materials covering every tech concept you need to stay up to date.
Subscribe now
View plans & pricing
Table of content icon View table of contents Preview book icon Preview Book

Git Best Practices Guide

Chapter 2. Working in a Team Using Git

This chapter introduces the aim of Git: team work.

A lot of programmers use Git every day; however often, they are not working alone but as part of a team. Git is a powerful versioning tool to work together, without erasing someone else's content. In the examples of this chapter, we will use the following conditions:

  • Three programmers working together on a simple website project
  • They install Git, but nothing is created
  • They own a dedicated server with Git, SSH, and GitLab installed on it

Creating a server repository

In the first chapter, we saw how to create a simple local Git repository, but now, it's time to create a server repository that will store and manage the code. Of course, for our example, it will be created by GitLab, but not everyone wants GitLab or GitHub.

Note

A server repository, also called "bare repository", is a Git repository without a working copy.

Git can use four protocols to transport data:

  • Local
  • Secure Shell (SSH)
  • Git
  • HTTP

We will see how and when to use these protocols. We will also distinguish between the pros and cons of each protocol.

For all protocols, we have to create the bare repository by executing these lines on the server's command lines.

Erik@server:~$ mkdir webproject
#Create the folder
Erik@server:~$ cd webproject
#go inside it
Erik@server:~/webproject$ git init --bare 
Initialized empty Git repository in /home/erik/webproject

With these commands, we create a directory web project and initialize an empty Git bare repository...

Pushing data on remote repositories – Jim's case

So, Jim initializes a new Git repository in the directory, where he starts coding, and he adds the remote repository with the SSH protocol. He has to commit and push what he coded earlier. This is how he did it:

Jim@local:~/webproject$ git add .
Jim@local:~/webproject$ git commit -m 'add my code'
[master (commit racine) 83fcc8a] add my code
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 index.html
create mode 100644 readme.txt
Jim@local:~/webproject$ git push –u origin master
Counting objects: 3, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 225 bytes | 0 byte/s, done.
Total 3 (delta 0), reused 0 (delta 0)

Now, the remote repository contains two files (index.html and readme.txt).

Pulling data from the repository

The other programmers have to pull data to get the new files.

Note

Every time you start working on a project, you have to pull data from the remote repository to maintain and ensure that the code is up to date.

The following command is used to pull data:

Erik@local:~/webproject$ git pull origin master

This command will check and compare your local commit hash to the remote hash. If the remote is the latest, it will try to merge data with the local master branch. This command is the equivalent of executing git fetch (get remote data) and git merge (merge to your branch).

The name of one of our remote repository is origin, and master is the current local branch.

Creating a patch

Let's explain what a patch is with an example. An external programmer was called by Jim to make small fixes in a part of the project, but Jim didn't want to give him access to the repository, thus preventing him from pushing data. So, he decides to make a patch and sends it by e-mail to Jim:

External@local:~/webproject$ git format-patch origin patch-webproject.patch

This command will create .patch files per commit and the external programmer will send the e-mail with it. So, he decides to make a patch and send it by e-mail to Jim.

Jim can import the patch by executing this:

Jim@local:~/webproject$ git apply /tmp/patch-webproject.patch

This command will apply the patch, but it doesn't create commits.

So, to generate a series of commits, use the git am command:

Jim@local:~/webproject$ git am /tmp/patch-webproject.patch

Working with branches

Git allows you to create branches, that is, named pointers to commits. You can work on different branches independently from each other. The default branch is most often called master.

A branch pointer in Git is 41 bytes large: 40 bytes of characters and an additional new line character. So, it explains why Git is very fast and cheap in terms of resource consumption.

If you decide to work on a branch, you have to checkout the branch. This means that Git restructures the working tree with the content of the commit to which the branch points and moves the HEAD pointer to the new branch.

The first command to know is:

Jim@local:~/webproject$ git branch

This command will display all available local branches for the repository. Inside the given list, the current working branch has the prefix *.

If you want to see all branches, including the remote branches, you will have to execute the following command:

Jim@local:~/webproject$ git branch -a

Creating a branch

You can create a branch...

Creating a server repository


In the first chapter, we saw how to create a simple local Git repository, but now, it's time to create a server repository that will store and manage the code. Of course, for our example, it will be created by GitLab, but not everyone wants GitLab or GitHub.

Note

A server repository, also called "bare repository", is a Git repository without a working copy.

Git can use four protocols to transport data:

  • Local

  • Secure Shell (SSH)

  • Git

  • HTTP

We will see how and when to use these protocols. We will also distinguish between the pros and cons of each protocol.

For all protocols, we have to create the bare repository by executing these lines on the server's command lines.

Erik@server:~$ mkdir webproject
#Create the folder
Erik@server:~$ cd webproject
#go inside it
Erik@server:~/webproject$ git init --bare 
Initialized empty Git repository in /home/erik/webproject

With these commands, we create a directory web project and initialize an empty Git bare repository.

Local

The local protocol...

Pushing data on remote repositories – Jim's case


So, Jim initializes a new Git repository in the directory, where he starts coding, and he adds the remote repository with the SSH protocol. He has to commit and push what he coded earlier. This is how he did it:

Jim@local:~/webproject$ git add .
Jim@local:~/webproject$ git commit -m 'add my code'
[master (commit racine) 83fcc8a] add my code
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 index.html
create mode 100644 readme.txt
Jim@local:~/webproject$ git push –u origin master
Counting objects: 3, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 225 bytes | 0 byte/s, done.
Total 3 (delta 0), reused 0 (delta 0)

Now, the remote repository contains two files (index.html and readme.txt).

Pulling data from the repository


The other programmers have to pull data to get the new files.

Note

Every time you start working on a project, you have to pull data from the remote repository to maintain and ensure that the code is up to date.

The following command is used to pull data:

Erik@local:~/webproject$ git pull origin master

This command will check and compare your local commit hash to the remote hash. If the remote is the latest, it will try to merge data with the local master branch. This command is the equivalent of executing git fetch (get remote data) and git merge (merge to your branch).

The name of one of our remote repository is origin, and master is the current local branch.

Creating a patch


Let's explain what a patch is with an example. An external programmer was called by Jim to make small fixes in a part of the project, but Jim didn't want to give him access to the repository, thus preventing him from pushing data. So, he decides to make a patch and sends it by e-mail to Jim:

External@local:~/webproject$ git format-patch origin patch-webproject.patch

This command will create .patch files per commit and the external programmer will send the e-mail with it. So, he decides to make a patch and send it by e-mail to Jim.

Jim can import the patch by executing this:

Jim@local:~/webproject$ git apply /tmp/patch-webproject.patch

This command will apply the patch, but it doesn't create commits.

So, to generate a series of commits, use the git am command:

Jim@local:~/webproject$ git am /tmp/patch-webproject.patch

Working with branches


Git allows you to create branches, that is, named pointers to commits. You can work on different branches independently from each other. The default branch is most often called master.

A branch pointer in Git is 41 bytes large: 40 bytes of characters and an additional new line character. So, it explains why Git is very fast and cheap in terms of resource consumption.

If you decide to work on a branch, you have to checkout the branch. This means that Git restructures the working tree with the content of the commit to which the branch points and moves the HEAD pointer to the new branch.

The first command to know is:

Jim@local:~/webproject$ git branch

This command will display all available local branches for the repository. Inside the given list, the current working branch has the prefix *.

If you want to see all branches, including the remote branches, you will have to execute the following command:

Jim@local:~/webproject$ git branch -a

Creating a branch

You can create a...

Tracking branches


With Git, a branch can track another branch. This allows you to use the commands pull and push, without specifying the branch and repository.

For example, if you clone a Git repository, your local master branch is created as a tracking branch for the master branch of the origin repository.

To set up a tracking branch, execute this:

Jim@local:~/webproject$ git checkout -b new_branch origin/branch_to_track
#Or you can use this
Jim@local:~/webproject$ git branch new_branch origin/master
Jim@local:~/webproject$ git branch --track new_branch origin/master

Similarly, you can specify to not track a remote branch:

Jim@local:~/webproject$ git branch --no-track new_branch origin/master
#You can later update this branch and track origin/master
Jim@local:~/webproject$ git branch -u origin/master new_branch

Deleting a branch from the remote

Use this command if you want to delete a branch in the remote repository:

Erik@local:~/webproject$ git branch -d origin/test
Left arrow icon Right arrow icon

Description

If you are a developer and you want to completely master Git without heavy theory, this is the book for you. A reasonable knowledge level and basic understanding of Git concepts will get you started with this book.

What you will learn

  • Create a Git repository and learn how to push your code to the repository Discover the easiest Git commands to use and manage your repository Learn how to find and resolve conflicts and mistakes Explore Git with your team members using commands such as clone, pull, and branch Set up Git for Continuous Integration to improve workflow Understand tag commits for mapping the application version An introduction to repository management and other Git tools

Product Details

Country selected
Publication date, Length, Edition, Language, ISBN-13
Publication date : Nov 20, 2014
Length: 102 pages
Edition : 1st
Language : English
ISBN-13 : 9781783553730
Vendor :
GitHub
Category :
Tools :

What do you get with a Packt Subscription?

Free for first 7 days. $19.99 p/m after that. Cancel any time!
Product feature icon Unlimited ad-free access to the largest independent learning library in tech. Access this title and thousands more!
Product feature icon 50+ new titles added per month, including many first-to-market concepts and exclusive early access to books as they are being written.
Product feature icon Innovative learning tools, including AI book assistants, code context explainers, and text-to-speech.
Product feature icon Thousands of reference materials covering every tech concept you need to stay up to date.
Subscribe now
View plans & pricing

Product Details

Publication date : Nov 20, 2014
Length: 102 pages
Edition : 1st
Language : English
ISBN-13 : 9781783553730
Vendor :
GitHub
Category :
Tools :

Packt Subscriptions

See our plans and pricing
Modal Close icon
€18.99 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
€189.99 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 €5 each
Feature tick icon Exclusive print discounts
€264.99 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 €5 each
Feature tick icon Exclusive print discounts

Frequently bought together


Stars icon
Total 80.97
Git Version Control Cookbook
€36.99
Git Best Practices Guide
€22.99
Git Essentials
€20.99
Total 80.97 Stars icon
Banner background image

Table of Contents

6 Chapters
1. Starting a Git Repository Chevron down icon Chevron up icon
2. Working in a Team Using Git Chevron down icon Chevron up icon
3. Finding and Resolving Conflicts Chevron down icon Chevron up icon
4. Going Deeper into Git Chevron down icon Chevron up icon
5. Using Git for Continuous Integration Chevron down icon Chevron up icon
Index Chevron down icon Chevron up icon

Customer reviews

Rating distribution
Full star icon Empty star icon Empty star icon Empty star icon Empty star icon 1
(1 Ratings)
5 star 0%
4 star 0%
3 star 0%
2 star 0%
1 star 100%
R. Wenner Apr 13, 2015
Full star icon Empty star icon Empty star icon Empty star icon Empty star icon 1
First and most annoyingly, the title is misleading. This is not a Best Practices book, this is the bare minimum of commands, cobbled together for people who never used git before. Only the last chapter gets into actual practices, but it is nothing more than an commentated rehash of blog posts on that topic.The book shows commands but does not explain the "why" behind them. For example, it tells you that you can push changes, but does not mention what pushing means or when and why you would do it. It tells you that you can have tracked and untracked branches, but does not say anything on why or why not you would want to do that. It does not even tell anything on why you would want branches at all. From a book called "Best Practices" I would expect a discussion on how to set up my branches and when to merge them. The author explains how you run the rebase command, but not why. From a BestPractices book I expect the pros and cons of rebasing and when and when not to use it.The book is incomplete; it refers to private and public branches without explaining what these are.Some example commands don't work as given. And that is not only because of missing spaces or e.g. botched stash names (stash@"1} instead of stash@{1}). Did this book have a copy editor?Some explanations are imprecise or plain wrong. For example, contrary to what the author states, git status does not magically print which files "need to be pushed". (How could it know what makes sense to push?) While the author mentions pros and cons of different repository access protocols, he doesn't even mention "encryption" when talking about SSH. When the author briefly touches on semantic versioning, he only mentions bug fixes, and as a beginner you may wonder how features fit in here. A hook script uses a /bin/sh shebang line and the author claims it's a bash script. Have fun with that on a system where /bin/sh does not default to bash, like Debian.
Amazon Verified review Amazon
Get free access to Packt library with over 7500+ books and video courses for 7 days!
Start Free Trial

FAQs

What is included in a Packt subscription? Chevron down icon Chevron up icon

A subscription provides you with full access to view all Packt and licnesed content online, this includes exclusive access to Early Access titles. Depending on the tier chosen you can also earn credits and discounts to use for owning content

How can I cancel my subscription? Chevron down icon Chevron up icon

To cancel your subscription with us simply go to the account page - found in the top right of the page or at https://subscription.packtpub.com/my-account/subscription - From here you will see the ‘cancel subscription’ button in the grey box with your subscription information in.

What are credits? Chevron down icon Chevron up icon

Credits can be earned from reading 40 section of any title within the payment cycle - a month starting from the day of subscription payment. You also earn a Credit every month if you subscribe to our annual or 18 month plans. Credits can be used to buy books DRM free, the same way that you would pay for a book. Your credits can be found in the subscription homepage - subscription.packtpub.com - clicking on ‘the my’ library dropdown and selecting ‘credits’.

What happens if an Early Access Course is cancelled? Chevron down icon Chevron up icon

Projects are rarely cancelled, but sometimes it's unavoidable. If an Early Access course is cancelled or excessively delayed, you can exchange your purchase for another course. For further details, please contact us here.

Where can I send feedback about an Early Access title? Chevron down icon Chevron up icon

If you have any feedback about the product you're reading, or Early Access in general, then please fill out a contact form here and we'll make sure the feedback gets to the right team. 

Can I download the code files for Early Access titles? Chevron down icon Chevron up icon

We try to ensure that all books in Early Access have code available to use, download, and fork on GitHub. This helps us be more agile in the development of the book, and helps keep the often changing code base of new versions and new technologies as up to date as possible. Unfortunately, however, there will be rare cases when it is not possible for us to have downloadable code samples available until publication.

When we publish the book, the code files will also be available to download from the Packt website.

How accurate is the publication date? Chevron down icon Chevron up icon

The publication date is as accurate as we can be at any point in the project. Unfortunately, delays can happen. Often those delays are out of our control, such as changes to the technology code base or delays in the tech release. We do our best to give you an accurate estimate of the publication date at any given time, and as more chapters are delivered, the more accurate the delivery date will become.

How will I know when new chapters are ready? Chevron down icon Chevron up icon

We'll let you know every time there has been an update to a course that you've bought in Early Access. You'll get an email to let you know there has been a new chapter, or a change to a previous chapter. The new chapters are automatically added to your account, so you can also check back there any time you're ready and download or read them online.

I am a Packt subscriber, do I get Early Access? Chevron down icon Chevron up icon

Yes, all Early Access content is fully available through your subscription. You will need to have a paid for or active trial subscription in order to access all titles.

How is Early Access delivered? Chevron down icon Chevron up icon

Early Access is currently only available as a PDF or through our online reader. As we make changes or add new chapters, the files in your Packt account will be updated so you can download them again or view them online immediately.

How do I buy Early Access content? Chevron down icon Chevron up icon

Early Access is a way of us getting our content to you quicker, but the method of buying the Early Access course is still the same. Just find the course you want to buy, go through the check-out steps, and you’ll get a confirmation email from us with information and a link to the relevant Early Access courses.

What is Early Access? Chevron down icon Chevron up icon

Keeping up to date with the latest technology is difficult; new versions, new frameworks, new techniques. This feature gives you a head-start to our content, as it's being created. With Early Access you'll receive each chapter as it's written, and get regular updates throughout the product's development, as well as the final course as soon as it's ready.We created Early Access as a means of giving you the information you need, as soon as it's available. As we go through the process of developing a course, 99% of it can be ready but we can't publish until that last 1% falls in to place. Early Access helps to unlock the potential of our content early, to help you start your learning when you need it most. You not only get access to every chapter as it's delivered, edited, and updated, but you'll also get the finalized, DRM-free product to download in any format you want when it's published. As a member of Packt, you'll also be eligible for our exclusive offers, including a free course every day, and discounts on new and popular titles.