diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-16 12:50:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-16 12:50:55 -0700 |
| commit | 9dd837e64f8d87429c47d34337338c7310299d79 (patch) | |
| tree | 9297b1ac83d93fb3cff73240ef9e9497402fa1d6 | |
| parent | b74d885b1158af927466d8727b0ec18792f39e35 (diff) | |
| parent | 70058db385fdf2191918c279ec081d7fee39d716 (diff) | |
| download | git-9dd837e64f8d87429c47d34337338c7310299d79.tar.gz | |
Merge branch 'jc/doc-rebase-fuzz-vs-offset-fix' into maint-2.46
"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"
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 74df345f9e..b18cdbc023 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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 (calling `am` internally). Patches are composed of multiple hunks, 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 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 |