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
14:52 MIN

Deconstructing the overloaded git commit command

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

Using Git as the single source of truth
03:21 MIN

Using Git as the single source of truth

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

Introduction to GitOps and the talk agenda
00:19 MIN

Introduction to GitOps and the talk agenda

Get ready for operations by pull requests

Applying GitOps principles to network automation
18:00 MIN

Applying GitOps principles to network automation

How Cisco embraced a DevOps culture within its network engineering team

Celebrating 20 years of Git and version control workflows
20:52 MIN

Celebrating 20 years of Git and version control workflows

WeAreDevelopers LIVE - 50 years Microsoft, Web Readiness Report, The German Web Community and more

Improving developer experience with a Git-based workflow
12:20 MIN

Improving developer experience with a Git-based workflow

Headless and JAMstack - The State of Commerce Today

Key benefits and principles of a true GitOps workflow
28:30 MIN

Key benefits and principles of a true GitOps workflow

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

Overview of the GitOps workflow and popular tools
24:48 MIN

Overview of the GitOps workflow and popular tools

GitOps: The past, present and future

Featured Partners

Related Videos

See all videos
Keep your code refactorable26:46

Keep your code refactorable

Gerrit Stapper

Ask Your Code33:17

Ask Your Code

Scott Chacon

How to Optimize Non-Coding Time26:35

How to Optimize Non-Coding Time

Yishai Beeri

Are Code Reviews Worth It? Insights from 16 Years of Review Data23:44

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

Sven Amann

Conventional commits vs gitmoji08:38

Conventional commits vs gitmoji

Omar Gallo

GitOps: The past, present and future47:42

GitOps: The past, present and future

Roberth Strand

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

A Practitioners Guide to GitOps - Introduction, Principles and Implementation

Thomas Schütz

Livecoding with AI31:39

Livecoding with AI

Rainer Stropek

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
Cloud Engineer (m/w/d)

Cloud Engineer (m/w/d)

fulfillmenttools
Köln, Germany

€50-65K
Intermediate
TypeScript
Google Cloud Platform
Continuous Integration
Software Engineer

Software Engineer

tree-IT GmbH
Bad Neustadt an der Saale, Germany

Remote
€54-80K
Intermediate
Senior
Java
TypeScript
Spring Boot