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

More from World Congress 2022

What the heck do "declarative" and "reactive" actually mean? thumbnail

about 4 years ago

What the heck do "declarative" and "reactive" actually mean?

André Kovac

The Design and Evolution of C++ thumbnail

over 4 years ago

The Design and Evolution of C++

Bjarne Stroustrup

But, you're not Facebook thumbnail

over 4 years ago

But, you're not Facebook

Kristijan Ristovski

Communicate efficiently with Software Architecture Diagrams thumbnail

over 4 years ago

Communicate efficiently with Software Architecture Diagrams

Simon Lasselsberger

Get Ready for Jakarta EE 10! thumbnail

over 4 years ago

Get Ready for Jakarta EE 10!

Ivar Grimstad

Keep your code refactorable thumbnail

over 4 years ago

Keep your code refactorable

Gerrit Stapper

Related videos

Why Git Still Matters thumbnail

World Congress 2026 Europe • 3 months ago

Why Git Still Matters

PJ Hagerty

Ask Your Code thumbnail

World Congress 2023 • about 3 years ago

Ask Your Code

Scott Chacon

Repository as Network: Visualizing Collaboration in git thumbnail

World Congress 2026 Europe • 3 months ago

Repository as Network: Visualizing Collaboration in git

Dmitry Yanter

How to Optimize Non-Coding Time thumbnail

World Congress 2022 • over 4 years ago

How to Optimize Non-Coding Time

Yishai Beeri

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

Coffee With Developers • 11 months ago

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

Daniel Siegl

How a Small Team Shrank a Microsoft Monorepo by 94% thumbnail

Coffee With Developers • almost 2 years ago

How a Small Team Shrank a Microsoft Monorepo by 94%

Jonathan Creamer

Related articles

CH

Chris Heilmann

Stop Googling Git Commands. Start Actually Learning Git.

Every developer has been there. You’re mid-flow, about to push a feature branch, and you need to undo your last three commits without blowing up the remote history. So you do what you always do: yo...

5 months ago

The Git Skills homepage showing you quizzes and how-tos.

DC

Daniel Cranney

How Microsoft worked around a Git limitation to shrink a repository by 94%

Imagine that you are responsible for a Git repository with 1000 users, and 20 million lines of code. You struggle to keep up with constant pull requests but the biggest problem is that the Git file...

almost 2 years ago

How Microsoft worked around a Git limitation to shrink a repository by 94%

DC

Daniel Cranney

Code reviews might actually be pointless

Code reviews are a well-trodden path in the world of software engineering, designed to help improve code quality and encourage collaboration among team members. Of course factors like security and ...

over 1 year ago

Code reviews might actually be pointless

DC

Daniel Cranney

Liuba Gonta and Yuliya Khadasevic - GitHub Copilot Beyond the Basics - 10 Ways to Elevate Your Coding

Welcome to a captivating journey through GitHub Copilot's advanced features, as discussed in a session by Liuba Gonta, a software developer and GitHub certified trainer at Xipier Netherlands, along...

almost 2 years ago

Liuba Gonta and Yuliya Khadasevic - GitHub Copilot Beyond the Basics - 10 Ways to Elevate Your Coding

From learning to earning

Jobs that call for the skills explored in this talk.

about 1 month ago • Verified

Founding Developer Advocate

San Francisco, United States

Experienced $150k–190k Remote GIT Bash Linux

about 2 months ago

Staff Developer Advocate, GitHub Security Lab

Experienced $121k–323k Remote Git Github Databases

Senior Software Engineer

Expert $124k–329k Remote Ruby Golang DevOps

about 1 month ago

Staff Software Engineer, GitHub Intelligence (Copilot Agents)

San Francisco, CA, United States

Experienced Ruby Golang Github

Senior Software Engineer, Enterprise Products

Expert $124k–329k Remote Ruby Bicep Golang

Software Engineer III

New York, NY, United States

Experienced $285k Remote Ruby NoSQL Golang