From e51b6b624994714c7e25d00e1204cefbf1b4ca12 Mon Sep 17 00:00:00 2001 From: Leo Lin Date: Fri, 15 Mar 2024 17:17:53 +0800 Subject: [PATCH 1/2] docs: fix typo --- gix/src/diff.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gix/src/diff.rs b/gix/src/diff.rs index bfe3feb0635..624e164d055 100644 --- a/gix/src/diff.rs +++ b/gix/src/diff.rs @@ -100,12 +100,12 @@ mod utils { .into()) } - /// Return a low-level utility to efficiently prepare a the blob-level diff operation between two resources, + /// Return a low-level utility to efficiently prepare a blob-level diff operation between two resources, /// and cache these diffable versions so that matrix-like MxN diffs are efficient. /// /// `repo` is used to obtain the needed configuration values. /// `mode` determines how the diffable files will look like, and also how fast, in average, these conversions are. - /// `attr_stack` is for accessing `.gitattributes` for knowing how to apply filters. Noow that it's typically adjusted based on the + /// `attr_stack` is for accessing `.gitattributes` for knowing how to apply filters. Now that it's typically adjusted based on the /// `roots` - if there are no worktree roots, `.gitattributes` are also not usually read from worktrees. /// `roots` provide information about where to get diffable data from, so source and destination can either be sourced from /// a worktree, or from the object database, or both. From c18734b05fcbc3d6f57bcb2c6525ec10015a7192 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 15 Mar 2024 16:51:51 +0100 Subject: [PATCH 2/2] Refine typo-fix --- gix/src/diff.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gix/src/diff.rs b/gix/src/diff.rs index 624e164d055..73274134657 100644 --- a/gix/src/diff.rs +++ b/gix/src/diff.rs @@ -105,7 +105,7 @@ mod utils { /// /// `repo` is used to obtain the needed configuration values. /// `mode` determines how the diffable files will look like, and also how fast, in average, these conversions are. - /// `attr_stack` is for accessing `.gitattributes` for knowing how to apply filters. Now that it's typically adjusted based on the + /// `attr_stack` is for accessing `.gitattributes` for knowing how to apply filters. Know that it's typically adjusted based on the /// `roots` - if there are no worktree roots, `.gitattributes` are also not usually read from worktrees. /// `roots` provide information about where to get diffable data from, so source and destination can either be sourced from /// a worktree, or from the object database, or both.