Johannes Haux

Git for Code Reviews

Your pull requests are hard to review. This talk provides the technical Git skills—from atomic commits to autosquash—to finally fix that.

Git for Code Reviews
#1about 2 minutes

Understanding the Git Flow branching model

The Git Flow model uses long-lived stable and develop branches alongside short-lived feature branches to structure collaborative work.

#2about 6 minutes

Staging parts of a file for atomic commits

Use the `git add -p` command to interactively stage specific parts of a file, creating clean, single-purpose commits.

#3about 3 minutes

Updating the latest commit with git amend

The `git commit --amend` command allows you to add staged changes to the most recent commit, effectively rewriting it.

#4about 2 minutes

Updating a branch with git rebase

Use `git rebase` to move a feature branch onto the latest commit of its base branch, maintaining a linear history.

#5about 2 minutes

Modifying older commits with interactive rebase

An interactive rebase (`git rebase -i`) allows you to stop at a specific commit in your history to edit, amend, and then continue.

#6about 3 minutes

Using fixup commits and autosquash for easier edits

Create `fixup!` commits that target older commits and then use `git rebase -i --autosquash` to automatically merge them in.

#7about 4 minutes

Q&A on code review tools and git best practices

The speaker answers audience questions about prioritizing comments, the risks of rebasing shared branches, and writing effective commit messages.

Related jobs
Jobs that call for the skills explored in this talk.

Matching moments

Deconstructing the overloaded git commit command
07:32 MIN

Deconstructing the overloaded git commit command

Coffee with Developers - Scott Chacon on growing GitButler and the future of version control

The asynchronous code review workflow in practice
03:22 MIN

The asynchronous code review workflow in practice

Are Code Reviews Worth It? Insights from 16 Years of Review Data

Using Git as the single source of truth
02:31 MIN

Using Git as the single source of truth

Everything as Code: A Dozen As-Code Concepts beyond Infrastructure or Configuration as Code

Core principles of a Git-centric workflow
04:27 MIN

Core principles of a Git-centric workflow

GitOps keeps focus on apps, not on infrastructure

Introduction to GitOps and the talk agenda
03:33 MIN

Introduction to GitOps and the talk agenda

Get ready for operations by pull requests

Q&A on merge vs rebase and writing commit messages
07:13 MIN

Q&A on merge vs rebase and writing commit messages

Ask Your Code

Using Git and GitHub for version control
01:53 MIN

Using Git and GitHub for version control

#90DaysOfDevOps - The DevOps Learning Journey

The workflow of an automated code review process
04:47 MIN

The workflow of an automated code review process

Build a CI/CD pipeline to automate code reviews and ensure code quality

Featured Partners

Related Videos

See all videos
GitOps: The past, present and future47:42

GitOps: The past, present and future

Roberth Strand

Keep your code refactorable26:46

Keep your code refactorable

Gerrit Stapper

Conventional commits vs gitmoji08:38

Conventional commits vs gitmoji

Omar Gallo

What AI Can Learn from Version Control - Daniel Siegl (Syntevo)38:14

What AI Can Learn from Version Control - Daniel Siegl (Syntevo)

Daniel Siegl

How a Small Team Shrank a Microsoft Monorepo by 94%33:23

How a Small Team Shrank a Microsoft Monorepo by 94%

Jonathan Creamer

GitOps for the people29:49

GitOps for the people

Lian Li

A Practitioners Guide to GitOps - Introduction, Principles and Implementation45:58

A Practitioners Guide to GitOps - Introduction, Principles and Implementation

Thomas Schütz

Build a CI/CD pipeline to automate code reviews and ensure code quality45:28

Build a CI/CD pipeline to automate code reviews and ensure code quality

Julien Delange

Related Articles

View all articles
S
Syntevo
Why SmartGit Is More Than a Git Client
SmartGit is more than a Git client. It gives developers precise, transparent control in complex or enterprise environments, prioritizing clarity, predictability, and correctness over shortcuts – earning trust as a reliable companion when Git operatio...
Why SmartGit Is More Than a Git Client
AG
Andre Braun, GitLab
Now is the time for industrialized software development
Now is the time for industrialized software development Recently, I received a letter from my car’s manufacturer alerting me to a recall. They had discovered a defective part and wanted to replace it. It was easily fixed, and I might have forgotten a...
Now is the time for industrialized software development
DC
Daniel Cranney
5 GitHub Repos That Help You Ship and Show Your Work
If you’re a regular reader here, you’ll know we absolutely love open source. In particular, we have a soft spot for the small, practical repos, the ones that don’t look like much at first glance, but turn out to be incredibly useful. We’ve rounded up...
5 GitHub Repos That Help You Ship and Show Your Work

From learning to earning

Jobs that call for the skills explored in this talk.

Software Engineer

Software Engineer

Code Healers LLC
Hinesville, United States of America

Remote
€40-50K
Intermediate
Senior
PHP
.NET
React
+2