4. Rebase Regularly and Interactively, and Other Use Cases | Git Version Control Cookbook

Sign In Start Free Trial

Book Overview & Buying
Table Of Contents
Feedback & Rating

Git Version Control Cookbook

By : Olsson, Voss

4 (3)

Git Version Control Cookbook

4 (3)

By: Olsson, Voss

Overview of this book

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. 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.

Preface

Preface

What this book covers

What you need for this book

Who this book is for

Conventions

Reader feedback

Customer support

Free Chapter

1. Navigating Git

1. Navigating Git

Introduction

Git's objects

The three stages

Viewing the DAG

Extracting fixed issues

Getting a list of the changed files

Viewing history with Gitk

Finding commits in history

Searching through history code

2. Configuration

2. Configuration

Configuration targets

Querying the existing configuration

Templates

A .git directory template

A few configuration examples

Git aliases

The refspec exemplified

3. Branching, Merging, and Options

3. Branching, Merging, and Options

Introduction

Managing your local branches

Branches with remotes

Forcing a merge commit

Using git rerere to merge known conflicts

The difference between branches

4. Rebase Regularly and Interactively, and Other Use Cases

4. Rebase Regularly and Interactively, and Other Use Cases

Introduction

Rebasing commits to another branch

Continuing a rebase with merge conflicts

Rebasing selective commits interactively

Squashing commits using an interactive rebase

Changing the author of commits using a rebase

Auto-squashing commits

5. Storing Additional Information in Your Repository

5. Storing Additional Information in Your Repository

Introduction

Adding your first Git note

Separating notes by category

Retrieving notes from the remote repository

Pushing notes to a remote repository

Tagging commits in the repository

6. Extracting Data from the Repository

6. 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

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

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

Introduction

Using a branch description in the commit message

Creating a dynamic commit message template

Using external information in the 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

8. Recovering from Mistakes

8. Recovering from Mistakes

Introduction

Undo – remove a commit completely

Undo – remove a commit and retain the changes to files

Undo – remove a commit and retain the 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

9. Repository Maintenance

9. Repository Maintenance

Introduction

Pruning remote branches

Running garbage collection manually

Turning off automatic garbage collection

Splitting a repository

Rewriting history – changing a single file

Back up your repositories as mirror repositories

A quick submodule how-to

Subtree merging

Submodule versus subtree merging

10. Patching and Offline Sharing

10. Patching and Offline Sharing

Introduction

Creating patches

Creating patches from branches

Applying patches

Sending patches

Creating Git bundles

Using a Git bundle

Creating archives from a tree

11. Git Plumbing and Attributes

11. Git Plumbing and Attributes

Introduction

Displaying the repository information

Displaying the tree information

Displaying the file information

Writing a blob object to the database

Writing a tree object to the database

Writing a commit object to the database

Keyword expansion with attribute filters

Metadata diff of binary files

Storing binaries elsewhere

Checking the attributes of a file

Attributes to export an archive

12. Tips and Tricks

12. Tips and Tricks

Introduction

Using git stash

Saving and applying stashes

Debugging with git bisect

Using the blame command

Color 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

Index

Index

Customer Reviews

4 (3)

5 star

33.3%

4 star

33.3%

3 star

33.3%

2 star

0%

1 star

0%

Rebasing commits to another branch

To start with, we are going to perform a very simple rebase where we will introduce a new file, commit this file, make a change to it, and then commit it again so that we end up with 2 new commits.

Getting ready

Before we start, we need a repository to work in. You can use a previous clone of jgit, but to get a close to identical output from the example, you can clone the jgit repository.

The jgit repository can be cloned as follows:

$ git clone https://git.eclipse.org/r/jgit/jgit chapter4
$ cd chapter4

How to do it…

We start by creating a local branch and then make two commits by performing the following steps; these are the commits that we want to rebase onto another branch:

Check out a new branch, rebaseExample, that tracks origin/stable-3.1:

 $ git checkout -b rebaseExample --track origin/stable-3.1
Branch rebaseExample set up to track remote branch stable-  3.1  from origin.
Switched to a new branch 'rebaseExample'

Make two commits on the rebaseExample...

Visually different images

CONTINUE READING

83

Tech Concepts

36

Programming languages

73

Tech Tools

Unlimited access to the largest independent learning library in tech of over 8,000 expert-authored tech books and videos.

Innovative learning tools, including AI book assistants, code context explainers, and text-to-speech.

50+ new titles added per month and exclusive early access to books as they are being written.

Git Version Control Cookbook

Search

Your notes and bookmarks