mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/doc-rebase-fuzz-vs-offset-fix'

Browse Source 
"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"
This commit is contained in:
Junio C Hamano
2024-08-01 10:18:11 -07:00
parent 891ee3b9db 70058db385
commit 5617a8eee8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rebase.txt
View File

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