Git Version Control Cookbook

Git Version Control Cookbook - Second Edition

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

Buy this Book

Git Version Control Cookbook - Second Edition

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

Buy this Book

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.

Title Page

Packt Upsell

Contributors

Preface

Free Chapter

Navigating Git

Extracting fixed issues

Getting a list of the changed files

Viewing the history with gitk

Finding commits in the history

Searching through the history code

Configuration

Introduction

Configuration targets

Querying the existing configuration

Templates

A .git directory template

A few configuration examples

Git aliases

The refspec exemplified

Branching, Merging, and Options

Introduction

Managing your local branches

Branches with remotes

Forcing a merge commit

Using git reuse recorded resolution (rerere) to merge Git conflicts

Compute the difference between branches

Orphan branches

Rebasing Regularly and Interactively, and Other Use Cases

Introduction

Rebasing commits to another branch

Continuing a rebase with merge conflicts

Rebasing selected commits interactively

Squashing commits using an interactive rebase

Changing the author of commits using a rebase

Autosquashing commits

Storing Additional Information in Your Repository

Introduction

Adding your first Git note

Separating notes by category

Retrieving notes from the remote repository

Pushing Git notes to a remote repository

Tagging commits in the repository

Extracting Data from the Repository

Introduction

Extracting the top contributor

Finding bottlenecks in the source tree

Grepping the commit messages

The contents of the releases

Finding what has been achieved in the repository in the last period

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

Introduction

Using a branch description in a commit message

Creating a dynamic commit message template

Using external information in a commit message

Preventing the push of specific commits

Configuring and using Git aliases

Configuring and using Git scripts

Setting up and using a commit template

Recovering from Mistakes

Introduction

Undo – Remove a commit completely

Undo – Remove a commit and retain changes to files

Undo – Remove a commit and retain changes in the staging area

Undo – Working with a dirty area

Redo – Recreate the latest commit with new changes

Revert – Undo the changes introduced by a commit

Reverting a merge

Viewing past Git actions with git reflog

Finding lost changes with git fsck

Repository Maintenance

Introduction

Pruning remote branches

Running garbage collection manually

Turning off automatic garbage collection

Splitting a repository

Rewriting history – changing a single file

Creating a backup of your repositories as mirror repositories

A quick "how-to" submodule

Subtree merging

Submodule versus subtree merging

Patching and Offline Sharing

Introduction

Creating patches

Creating patches from branches

Creating archives from a tree

Tips and Tricks

Introduction

Using git stash

Saving and applying stashes

Debugging with git bisect

Using the blame command

Coloring the UI in the prompt

Autocompletion

Bash prompt with status information

More aliases

Interactive add

Interactive add with Git gui

Ignoring files

Showing and cleaning ignored files

Git Providers, Integrations, and Clients

Introduction

Setting up an organization at GitHub

Creating a repository at GitHub

Adding templates for issues and pull requests

Creating a GitHub API key

Using GitHub to authenticate at Jenkins

Triggering Jenkins builds

Using Jenkinsfiles

Other Books You May Enjoy

Leave a review - let other readers know what you think

Index

Customer Reviews

5 star

4 star

3 star

2 star

1 star

Using git reuse recorded resolution (rerere) to merge Git conflicts

While working on a feature branch, you probablylike to merge daily or perhaps more often, but when you work on long-living feature branches, you end up in a situation where you have the same conflicts occurring repeatedly.

Here, you can use git rerere, which stands for reuse recorded resolution. Gitrerere is not enabled by default, but can be enabled with the following command:

$ git config rerere.enabled true

Note

You can configure it globally by adding --global to the git config command.

How to do it...

Perform the following steps to merge the known conflicts:

In the jgitrepository folder, start by checking out a branch that tracks origin/stable-2.2:

$ git checkout -b rerereExample --track origin/stable-2.2

Now, change the maven-compiler-plugin version to something personalized, such as 2.5.2, as this is in line 211 in pom.xml. If you run git diff, you should get a result very similar to the following:

$ git diff 

diff --git a...

Git Version Control Cookbook - Second Edition

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

Git Version Control Cookbook - Second Edition

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

Overview of this book

Related Content you might be interested in

Current Title:

Git Version Control Cookbook - Second Edition

Git Essentials

Git for Programmers

Version Control with Git and GitHub

Using git reuse recorded resolution (rerere) to merge Git conflicts

Note

How to do it...