Subscription

Explore Products

Best Sellers

New Releases

Books

Videos

Audiobooks

Learning Hub

Conferences

Free Learning

You're reading from Git Version Control Cookbook Leverage version control to transform your development workflow and boost productivity

Product type Paperback

Published in Jul 2018

Publisher

ISBN-13 9781789137545

Length 354 pages

Edition 2nd Edition

Tools

Git

Concepts

Version Control

Authors (4):

Aske Olsson

Emanuele Zattin(EUR)

Kenneth Geisshirt

Rasmus Voss

View More author details

Table of Contents (14) Chapters

Preface

1. Navigating Git FREE CHAPTER

2. Configuration

3. Branching, Merging, and Options

4. Rebasing 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. Tips and Tricks

12. Git Providers, Integrations, and Clients

13. Other Books You May Enjoy

Leave a review - let other readers know what you think

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 reuse recorded resolution (rerere) to merge Git conflicts
Computing the difference between branches
Orphan branches

The rest of the chapter is locked

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 €18.99/month. Cancel anytime

Authors (4)

Zattin(EUR)

Emanuele Zattin is the Continuous Integration Specialist at Realm Inc. with experience in software development and design. He is respected for his work in designing and developing a CM Synergy to Git history conversion tool and rolling out Git-Gerrit-Jenkins in several Nokia divisions.

See other products by Zattin(EUR)

Kenneth Geisshirt

Kenneth Geisshirt is a chemist, by education, and a strong free-software advocate. He spent his Christmas holidays in 1992 installing SLS Linux, and GNU/Linux has been his favorite operating system ever since. Currently, he does consultancy work in fields such as scientific computing and Linux clusters. He lives in Copenhagen, Denmark, with his partner and their two children.

See other products by Kenneth Geisshirt

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

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