Johannes Haux
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.
Power Plus Communications
Mannheim, Germany
Intermediate
Senior
Docker
Kubernetes
+2
ROSEN Technology and Research Center GmbH
Osnabrück, Germany
Senior
TypeScript
React
+3
Matching moments
14:14 MIN
Scripting presentations and demos in VS Code
Devs vs. Marketers, COBOL and Copilot, Make Live Coding Easy and more - The Best of LIVE 2025 - Part 3
09:00 MIN
Navigating the growing complexity of modern CSS
WeAreDevelopers LIVE – You Don’t Need JavaScript, Modern CSS and More
01:32 MIN
Organizing a developer conference for 15,000 attendees
Cat Herding with Lions and Tigers - Christian Heilmann
03:16 MIN
Improving the developer feedback loop with specialized tools
Developer Time Is Valuable - Use the Right Tools - Kilian Valkhof
05:32 MIN
Getting hired by contributing to open source projects
Devs vs. Marketers, COBOL and Copilot, Make Live Coding Easy and more - The Best of LIVE 2025 - Part 3
06:46 MIN
How AI-generated content is overwhelming open source maintainers
WeAreDevelopers LIVE – You Don’t Need JavaScript, Modern CSS and More
02:33 MIN
Why you might not need JavaScript for everything
WeAreDevelopers LIVE – You Don’t Need JavaScript, Modern CSS and More
03:58 MIN
Making accessibility tooling actionable and encouraging
Developer Time Is Valuable - Use the Right Tools - Kilian Valkhof
Featured Partners
Related Videos
26:46Keep your code refactorable
Gerrit Stapper
33:17Ask Your Code
Scott Chacon
26:35How to Optimize Non-Coding Time
Yishai Beeri
23:44Are Code Reviews Worth It? Insights from 16 Years of Review Data
Sven Amann
08:38Conventional commits vs gitmoji
Omar Gallo
38:14What AI Can Learn from Version Control - Daniel Siegl (Syntevo)
Daniel Siegl
29:35GitHub Copilot Beyond the Basics - 10 Ways to Elevate Your Coding
Liuba Gonta & Yuliya Khadasevich
33:23How a Small Team Shrank a Microsoft Monorepo by 94%
Jonathan Creamer
Related Articles
View all articles
From learning to earning
Jobs that call for the skills explored in this talk.
expertplace professionals GmbH
Dresden, Germany
Intermediate
Go
C++
GIT
Java
Redis
+9
Grafton Deutschland GmbH
Nürnberg, Germany
Senior
GIT
Java
JIRA
Bash
Linux
+10
Visonum GmbH
Remote
Junior
Intermediate
React
Redux
TypeScript
tree-IT GmbH
Bad Neustadt an der Saale, Germany
€54-80K
Intermediate
Senior
Java
TypeScript
Spring Boot
Hubert Burda Media
München, Germany
€80-95K
Intermediate
Senior
Node.js
JavaScript
TypeScript
Patronus Group
Berlin, Germany
Senior
Kotlin
Spring Boot
Amazon Web Services (AWS)
Confideck GmbH
Vienna, Austria
Remote
Intermediate
Senior
Node.js
MongoDB
TypeScript