Once the unwanted hunks are removed, we can exit and save out of the editor session. 1 # Manual hunk edit mode - see bottom for a quick guide. Like the instructions say, if we want to first add in the method_a changes, we would need to remove lines 7 to 10 in order to only add lines 3 to 6 to our staging area. 1 # Manual hunk edit mode - see bottom for a quick guide.ġ3 # To remove '-' lines, make them ' ' lines (context).ġ5 # Lines starting with # will be removed. We need to get into the weeds and use e(manual) in order to split this manually into separate hunks. What we could do instead is split these patches with the split option to keep it tidy: Stage this hunk ? sĭoh! We can’t split this hunk when code changes are too close together, the split option can’t conveniently split up those changes into hunks.

+++ -17,4 +17,12 class User < ApplicationRecordĪdding them all grouped together with commit messages like Fix up feature A and B for code review can make the PR look untidy before squashing and merging it. $ git add app/models/user.rb -pĭiff -git a/app/models/user.rb b/app/models/user.rb

We could go about this by adding and committing these changes as a fix in response to the code review. Suppose we are recommended to extract some functionality into their own methods. Lets begin with how we could use git add -patch to keep relevant code changes grouped: There are times where split won’t conveniently break up lines into hunks, lets explore how we can manually edit those tricky splits. Git add patch gives us many options: Stage this hunk ?, the split option allows us to split lines that are close in proximity to each other. Not only will this make your pull requests cleaner, but will allow the code reviewer to get valuable context when diving into code changes on said file. This a great way for developers to split up code changes on one file to their own commit message. If you’ve been following our Git related posts, you probably notice we use git add -p with many of the examples used.

Git make notepad++ editor