diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-07-25 10:27:29 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-07-25 10:28:58 -0700 |
commit | 70058db385fdf2191918c279ec081d7fee39d716 (patch) | |
tree | d7770ed12510e88aec71cfd8d6982132d9a350dd /builtin/commit.c | |
parent | dbecc617f75eea6ee5d05823a38b91223ff22b11 (diff) |
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions