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.

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

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

GitOps keeps focus on apps, not on infrastructure36:09

GitOps keeps focus on apps, not on infrastructure

Chad Carlson

GitOps for the people29:49

GitOps for the people

Lian Li

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

How a Small Team Shrank a Microsoft Monorepo by 94%

Jonathan Creamer

From learning to earning

Jobs that call for the skills explored in this talk.

Rust and GoLang

Rust and GoLang

NHe4a GmbH
Karlsruhe, Germany

Remote
€55-65K
Intermediate
Senior
Go
Rust
Lead Full-Stack Engineer

Lead Full-Stack Engineer

Hubert Burda Media
München, Germany

€80-95K
Intermediate
Senior
React
Vue.js
Node.js
MongoDB
+1
Dev Ops / Infra

Dev Ops / Infra

Roots Energy GmbH
Vienna, Austria

Senior
Python
Docker
Terraform
IT Security
Continuous Integration