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

Arrow left icon
Profile Icon PIDOUX Eric
Arrow right icon
Can$20.99 Can$30.99
Full star icon Empty star icon Empty star icon Empty star icon Empty star icon 1 (1 Ratings)
eBook Nov 2014 102 pages 1st Edition
eBook
Can$20.99 Can$30.99
Paperback
Can$37.99
Subscription
Free Trial
Arrow left icon
Profile Icon PIDOUX Eric
Arrow right icon
Can$20.99 Can$30.99
Full star icon Empty star icon Empty star icon Empty star icon Empty star icon 1 (1 Ratings)
eBook Nov 2014 102 pages 1st Edition
eBook
Can$20.99 Can$30.99
Paperback
Can$37.99
Subscription
Free Trial
eBook
Can$20.99 Can$30.99
Paperback
Can$37.99
Subscription
Free Trial

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
OR
Modal Close icon
Payment Processing...
tick Completed

Billing Address

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 : 9781783553747
Vendor :
GitHub
Category :
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
OR
Modal Close icon
Payment Processing...
tick Completed

Billing Address

Product Details

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

Packt Subscriptions

See our plans and pricing
Modal Close icon
$19.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
$199.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 Can$6 each
Feature tick icon Exclusive print discounts
$279.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 Can$6 each
Feature tick icon Exclusive print discounts

Frequently bought together


Stars icon
Total Can$ 134.97
Git Version Control Cookbook
Can$61.99
Git Best Practices Guide
Can$37.99
Git Essentials
Can$34.99
Total Can$ 134.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

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.