Rebase
Rebase
Rebase

Last updated on 2015-07-26

About the Book

A practical guide to rebasing with Git

Rebasing is one of Gits most powerful features. Yet we've found that not many developers know how to use it properly to create and adopt powerful workflows. This book goes far behind the regular Git book with a strong focus on rebasing. 

The book is written entirely in the open on GitHub so you have a chance to participate or just leave opinions.

This book will teach you the ins and outs of rebasing with Git. You'll learn:

  • The essence of what a commit in Git actually is
  • What Three-Way and Fast-Forward merges are
  • What rebasing is and how it compares to merging
  • The implications of a rebase vs a merge workflow
  • How to perform a simple rebase
  • How to perform interactive rebases
  • How to change the order of commits in a history
  • How to split an older commit into multiple commits
  • How to split commits by individual files
  • How to split commits by individual changes in one file
  • How to squash commits together
  • How to execute programs during an interactive rebase
  • The easy way to generate beautiful changelogs with clog
  • The Zen of our "I'll fix that later"-workflow

About the Editors

thoughtram
thoughtram

We enjoy learning new stuff every day and we love teaching it to others even more. We want learning to be both fun and efficient. That's why we help people to get a deep understanding of different technologies.

Find out more at thoughtram.io.

Christoph Burgdorf
Christoph Burgdorf

Christoph is the frontend team lead at CouchCommerce and the co-founder of thoughtram.

He began with programming at the age of 10 with BASIC but has since moved on to become proficient in various different programming languages and technologies.

Christoph has contributed to many projects, including AngularJSjquery-uiTodoMVC and the banshee media player. When he's not evangelizing git, he likes to travel the world with his bicycle.

Pascal Precht
Pascal Precht

Pascal is a front-end engineer with a love for semantic markup and evolving technologies in the open web. He loves contributing to open source and is the creator of the popular angular-translate module.

He also likes traveling the world and speaks at conferences and meetups. When he's not busy preparing the next workshops for thoughtram, you might find him outside with his skateboard.

About the Contributors

Carmen Popoviciu
Carmen Popoviciu

Software Engineer

Carmen is a front-end engineer and the leading lady of the Dutch AngularJS Group. She loves Angular and is passionate about its community. She hopes to one day make a difference for the web with the code she writes.

The Leanpub 45-day 100% Happiness Guarantee

Within 45 days of purchase you can get a 100% refund on any Leanpub purchase, in two clicks.

See full terms...

Write and Publish on Leanpub

Authors, publishers and universities use Leanpub to publish amazing in-progress and completed books and courses, just like this one. You can use Leanpub to write, publish and sell your book or course as well! Leanpub is a powerful platform for serious authors, combining a simple, elegant writing and publishing workflow with a store focused on selling in-progress ebooks. Leanpub is a magical typewriter for authors: just write in plain text, and to publish your ebook, just click a button. It really is that easy.

Learn more about writing on Leanpub