doc: difference in location to apply is "offset", not "fuzz"
The documentation to "git rebase" says that the line numbers (in the rebased change) may not exactly be the same as the line numbers the change gets replayed on top of the new base, but uses a wrong noun "fuzz". It should have said "offset". They are both terms of art. "fuzz" is about context lines not exactly matching. "offset" is about the difference in the location that a change was taken from the original and the change gets replayed on the target. "offset" is often inevitable and part of normal life. "fuzz" on the other hand is often a sign of trouble (and indeed "Git" refuses to apply a change with "fuzz", except there are options to be fuzzy about whitespaces). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 25, 2024 at 10:27 UTC
70058db385fdf2191918c279ec081d7fee39d716
1 file changed
+1
-1
Documentation/git-rebase.txt
+1
-1
@@ -715,7 +715,7 @@ The 'apply' backend works by creating a sequence of patches (by calling
715
`format-patch` internally), and then applying the patches in sequence
716
(calling `am` internally). Patches are composed of multiple hunks,
717
each with line numbers, a context region, and the actual changes. The
718
-line numbers have to be taken with some fuzz, since the other side
718
+line numbers have to be taken with some offset, since the other side
719
will likely have inserted or deleted lines earlier in the file. The
720
context region is meant to help find how to adjust the line numbers in
721
order to apply the changes to the right lines. However, if multiple