Packt+ | Advance your knowledge in tech

0

All Products

Best Sellers

New Releases

Books

Videos

Audiobooks

Free Learning

Git Version Control Cookbook

You're reading from Git Version Control Cookbook 90 hands-on recipes that will increase your productivity when using Git as a version control system

Product type Paperback

Published in Jul 2014

Publisher

ISBN-13 9781782168454

Length 340 pages

Edition 1st Edition

Tools

Git

Concepts

Version Control

Authors (2):

Olsson

Voss

View More author details

Table of Contents (19) Chapters

Git Version Control Cookbook

Credits

About the Authors

About the Reviewers

www.PacktPub.com

Preface

1. Navigating Git FREE CHAPTER

2. Configuration

3. Branching, Merging, and Options

4. Rebase Regularly and Interactively, and Other Use Cases

5. Storing Additional Information in Your Repository

6. Extracting Data from the Repository

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

8. Recovering from Mistakes

9. Repository Maintenance

10. Patching and Offline Sharing

11. Git Plumbing and Attributes

12. Tips and Tricks

Index

Chapter 3. Branching, Merging, and Options

In this chapter, we will cover the following recipes:

Managing your local branches
Branches with remotes
Forcing a merge commit
Using git rerere to merge Git conflicts
The difference between branches

The rest of the chapter is locked

Register for a free Packt account to unlock a world of extra content!

A free Packt account unlocks extra newsletters, articles, discounted offers, and much more. Start advancing your knowledge today.

Unlock this book and the full library FREE for 7 days

Get unlimited access to 7000+ expert-authored eBooks and videos courses covering every tech area you can think of

Start free trial

Renews at $15.99/month. Cancel anytime

Authors (2)

Olsson

Olsson

Aske Olsson has more than 14 years of experience in the software industry. As an electrical engineer, he has been using every tool available for development, from a soldering iron over Assembly, C, Java Groovy, Python and various DSLs for programming to different SCMs and build-, CI- and issue-tracking systems. He has worked for Nokia for 6 years and, currently, works at Keylane. Aske has experience with Git; he has been teaching Git in regular training sessions, from basic Git to advanced usage.

See other products by Olsson

Voss

Voss

Rasmus Voss has been working with continuous integration, continuous delivery, automatic testing, and DevOps, in various industries. He has always strived to ensure that where developers, testers, project leaders, and managers can work with the system instead of against the system. Typically, the processes and solutions he develops are clear, precise, and well documented, with relevant feedback to all parts of the software development process.

See other products by Voss

Personalised recommendations for you

Based on your interests and search pattern

LLVM Code Generation

LLVM Code Generation

LLVM is a key technology for building modern compilers. You'll learn how to use its infrastructure to create and extend backends (X86 and AArch64), and contribute to the LLVM open-source project, equipping you with key skills in compiler design.

May 2025 20h 40m

Domain-Driven Refactoring

Domain-Driven Refactoring

This book is your exhaustive guide to applying DDD practices for building robust applications. You'll learn key patterns, refine business logic, and solve real-world problems with DDD principles, refactoring, and event-driven architectures.

May 2025 10h 48m

The Power Platform Playbook for Digital Transformation

The Power Platform Playbook for Digital Transformation

Transform your business with Power Apps, Power Automate, Power BI, and Copilot Studio. This guide covers automation, AI insights, governance, and security, helping leaders, IT pros, and analysts build scalable, low-code enterprise solutions.

Apr 2025 11h 44m

Microservices with Go

Microservices with Go

The book covers Go microservice development, covering the basics for beginners and best practices for structuring Go apps. Novice as well seasoned developers will gain insights into managing and scaling microservices.

Jun 2025 14h 16m