Skip to content

Commit 5617a8e

Browse files
committed
Merge branch 'jc/doc-rebase-fuzz-vs-offset-fix'
"git rebase --help" referred to "offset" (the difference between the location a change was taken from and the change gets replaced) incorrectly and called it "fuzz", which has been corrected. * jc/doc-rebase-fuzz-vs-offset-fix: doc: difference in location to apply is "offset", not "fuzz"
2 parents 891ee3b + 70058db commit 5617a8e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ The 'apply' backend works by creating a sequence of patches (by calling
737737
`format-patch` internally), and then applying the patches in sequence
738738
(calling `am` internally). Patches are composed of multiple hunks,
739739
each with line numbers, a context region, and the actual changes. The
740-
line numbers have to be taken with some fuzz, since the other side
740+
line numbers have to be taken with some offset, since the other side
741741
will likely have inserted or deleted lines earlier in the file. The
742742
context region is meant to help find how to adjust the line numbers in
743743
order to apply the changes to the right lines. However, if multiple

0 commit comments

Comments
 (0)