Git Version Control Cookbook

Aske Olsson, Rasmus Voss

• Editorial: Packt Publishing
• Año: 2014
• ISBN:
  9781782168454
• Edición: 1
• Categoría: Computer Science
• Categoría: Content Management Systems

In Detail

Starting with the Git data model, you will learn how Git stores files and how it looks at commits. You will then learn how you can recover from mistakes; from committing on the wrong branch to recovering lost commits/files. Next, you will discover how you can force rebase on some branches and use regular Git merge on other branches. You will also learn how to extract information from the repository.

As you progress through this book, you will learn how you can automate the usual Git processes by utilizing the hook system built into Git. The book also covers advanced repository management, including different options to rewrite the history of a Git repository. Finally, you will discover how you can work offline with Git, how to track what is going on behind the scenes, and how to use the stash for different purposes.

Approach

This practical guide contains a wide variety of recipes, taking you through all the topics you need to know about to fully utilize the most advanced features of the Git system.

Who this book is for

If you are a software developer or a build and release engineer who uses Git in your daily work and want to take your Git knowledge to the next level, then this book is for you. To understand and follow the recipes included in this book, basic knowledge of Git command-line code is mandatory.

Git Version Control Cookbook

---

Table of Contents

Git Version Control Cookbook

Credits

About the Authors

About the Reviewers

www.PacktPub.com

Support files, eBooks, discount offers, and more

Why Subscribe?

Free Access for Packt account holders

Preface

What this book covers

What you need for this book

Who this book is for

Conventions

Reader feedback

Customer support

Downloading the example code

Errata

Piracy

Questions

1. Navigating Git

Introduction

Git's objects

Getting ready

How to do it...

The commit object

The tree object

The blob object

The branch

The tag object

How it works...

There's more...

See also

The three stages

Getting ready

How to do it…

How it works…

See also

Viewing the DAG

Getting ready

How to do it...

How it works...

See also

Extracting fixed issues

Getting ready

How to do it...

How it works...

There's more...

Getting a list of the changed files

Getting ready

How to do it...

How it works...

There's more...

See also

Viewing history with Gitk

Getting ready

How to do it...

How it works...

There's more...

Finding commits in history

Getting ready

How to do it...

How it works...

There's more...

Searching through history code

Getting ready

How to do it...

How it works...

There's more...

2. Configuration

Configuration targets

Getting ready

How to do it...

How it works...

There's more...

Querying the existing configuration

Getting ready

How to do it...

How it works...

There's more...

Templates

Getting ready

How to do it...

How it works...

A .git directory template

Getting ready

How to do it...

How it works...

See also

A few configuration examples

Getting ready

How to do it...

Rebase and merge setup

Expiry of objects

Autocorrect

How it works...

There's more...

Git aliases

Getting ready

How to do it...

How it works...

There's more...

The refspec exemplified

Getting ready

How to do it...

How it works...

3. Branching, Merging, and Options

Introduction

Managing your local branches

Getting ready

How to do it…

How it works…

There's more...

Branches with remotes

Getting ready

How to do it…

There's more...

Forcing a merge commit

Getting ready

How to do it...

There's more…

Using git rerere to merge known conflicts

How to do it…

There's more...

The difference between branches

Getting ready

How to do it…

There's more…

4. Rebase Regularly and Interactively, and Other Use Cases

Introduction

Rebasing commits to another branch

Getting ready

How to do it…

How it works

Continuing a rebase with merge conflicts

How to do it

How it works

There's more…

Rebasing selective commits interactively

Getting ready

How to do it

There's more…

Squashing commits using an interactive rebase

Getting ready

How to do it...

There's more…

Changing the author of commits using a rebase

Getting ready

How to do it...

How it works...

Auto-squashing commits

Getting ready

How to do it...

There's more…

5. Storing Additional Information in Your Repository

Introduction

Adding your first Git note

Getting ready

How to do it…

There's more...

Separating notes by category

Getting ready

How to do it...

How it works...

Retrieving notes from the remote repository

Getting ready

How to do it...

How it works...

Pushing notes to a remote repository

How to do it...

There's more...

Tagging commits in the repository

Getting ready

How to do it...

There's more...

6. Extracting Data from the Repository

Introduction

Extracting the top contributor

Getting ready

How to do it...

There's more...

Finding bottlenecks in the source tree

Getting ready

How to do it...

There's more...

Grepping the commit messages

Getting ready

How to do it...

The contents of the releases

How to do it...

How it works...

7. Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts

Introduction

Using a branch description in the commit message

Getting ready

How to do it...

Creating a dynamic commit message template

Getting ready

How to do it...

There's more...

Using external information in the commit message

Getting ready

How to do it...

Preventing the push of specific commits

Getting ready

How to do it...

There's more...

Configuring and using Git aliases

How to do it...

How it works...

Configuring and using Git scripts

How to do it...

Setting up and using a commit ...

Índice

• Git Version Control Cookbook