World Congress 2022 Jun 15, 2022

Git for Code Reviews

Johannes Haux

Drowning in massive, chaotic pull requests? Master interactive rebasing, clean atomic commits, and history rewriting to make your code reviews fast, painless, and perfectly structured.

Pause
Mute Enter Fullscreen
#1 about 4 min

Introduction to git flow and clean feature branches

Context on structural workflows and the value of a clean history for code reviews.

#2 about 6 min

Staging partial files with the patch command

How to stage specific parts of a single file to create atomic commits.

#3 about 3 min

Updating the most recent commit with amend

Modifying the latest commit to fix mistakes without polluting the history log.

#4 about 3 min

Incorporating main branch changes via rebase

Moving a feature branch forward to the end of the main branch to maintain a linear history.

#5 about 2 min

Modifying older commits using interactive rebase

Stepping back through branch history to target and amend earlier commits.

#6 about 2 min

Squashing history automatically with fixup commits

Generating targeted fixup commits and using auto-squash to merge them seamlessly.

#7 about 3 min

Overwriting remote repositories via force pushing

Safely updating remote origins after performing local rebasing or amending operations.

#8 about 4 min

Handling review priorities, collaboration, and commit details

Audience discussion concerning review tooling limitations, teammate impact from history changes, and descriptive commit formatting.

Matching moments

2:26 min

Establishing automated Git workflows as a stable single source

Zan Markan Zan Markan · LIVE

3:40 min

Improving developer experience with Git workflows and deploy previews

Anil Kumar Krishnashetty · LIVE

1:58 min

Maintaining clean git histories with rebasing and fixup commits

Dennis Doomen Dennis Doomen · World Congress 2026 Europe

1:19 min

Adopting standard branching strategies and utilizing repository forks

Dennis Doomen Dennis Doomen · World Congress 2026 Europe

2:20 min

Achieving continuous merge while maintaining necessary code reviews

Yishai Beeri · World Congress 2022

56 sec

Favorite git commands and the importance of patch commits

Eileen Uchitelle Eileen Uchitelle +1 · Coffee With Developers

Upcoming sessions on this topic

Open session

World Congress 2026 North America

September 25, 2026 · 13:30–14:00

Stage 6

The Autonomous Pull Request: Let Agents Ship Without Surrendering Control

Sam Jarvinen

Senior Solutions Engineer, GitHub

Sam Jarvinen
Open session

World Congress 2026 North America

September 25, 2026 · 10:20–10:50

Stage 1

Fixing Git for Agents: Somewhere Between the Prompt and Production, We Lost the Plot

Karthik Rameshkumar

Field CTO at Entire

Karthik Rameshkumar
Open session

World Congress 2026 North America

September 24, 2026 · 16:50–17:20

Stage 3

Merging at Scale: From Broken Builds to Green Mainline

Manjari Akella, Preetam Dwivedi

Manjari Akella
Preetam Dwivedi
Open session

World Congress 2026 North America

September 24, 2026 · 13:30–15:30

Stage 8

The Developer's Guide to an Agentic Git Forge

Lizzie Siegle, Evis Drenova

Lizzie Siegle
Evis Drenova
Open session

World Congress 2026 North America

September 23, 2026 · 13:00–13:30

Stage 2

Parallelize Your Development with GitHub Copilot

Pamela Fox

Principal Cloud Advocate, Microsoft

Pamela Fox
Open session

World Congress 2026 North America

September 24, 2026 · 16:10–16:40

Stage 2

The Death of the Code Review

Laurie Voss

Head of Developer Relations

Laurie Voss