Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 5 insertions, 5 deletions

diff --git a/vendor/gix-config-value/src/color.rs b/vendor/gix-config-value/src/color.rs
index 606eef079..7d8af6555 100644
--- a/vendor/gix-config-value/src/color.rs
+++ b/vendor/gix-config-value/src/color.rs
@@ -99,7 +99,7 @@ impl TryFrom<Cow<'_, BStr>> for Color {
 
 /// Discriminating enum for names of [`Color`] values.
 ///
-/// `gix-config` supports the eight standard colors, their bright variants, an
+/// `git-config` supports the eight standard colors, their bright variants, an
 /// ANSI color code, or a 24-bit hex value prefixed with an octothorpe/hash.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
 #[allow(missing_docs)]
@@ -232,7 +232,7 @@ impl TryFrom<&BStr> for Name {
 bitflags::bitflags! {
     /// Discriminating enum for [`Color`] attributes.
     ///
-    /// `gix-config` supports modifiers and their negators. The negating color
+    /// `git-config` supports modifiers and their negators. The negating color
     /// attributes are equivalent to having a `no` or `no-` prefix to the normal
     /// variant.
     #[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
diff --git a/vendor/gix-config-value/src/integer.rs b/vendor/gix-config-value/src/integer.rs
index b287899ec..7214b76e4 100644
--- a/vendor/gix-config-value/src/integer.rs
+++ b/vendor/gix-config-value/src/integer.rs
@@ -87,7 +87,7 @@ impl TryFrom<Cow<'_, BStr>> for Integer {
     }
 }
 
-/// Integer suffixes that are supported by `gix-config`.
+/// Integer suffixes that are supported by `git-config`.
 ///
 /// These values are base-2 unit of measurements, not the base-10 variants.
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
diff --git a/vendor/gix-config-value/src/lib.rs b/vendor/gix-config-value/src/lib.rs
index 130674e5a..5b4f3fa76 100644
--- a/vendor/gix-config-value/src/lib.rs
+++ b/vendor/gix-config-value/src/lib.rs
@@ -1,4 +1,4 @@
-//! Parsing for data types used in `gix-config` files to allow their use from environment variables and other sources.
+//! Parsing for data types used in `git-config` files to allow their use from environment variables and other sources.
 //!
 //! ## Feature Flags
 #![cfg_attr(
diff --git a/vendor/gix-config-value/src/types.rs b/vendor/gix-config-value/src/types.rs
index 6af0162c8..232a55f3f 100644
--- a/vendor/gix-config-value/src/types.rs
+++ b/vendor/gix-config-value/src/types.rs
@@ -4,7 +4,7 @@ use crate::{color, integer};
 /// collection of color (text) modifiers, or a combination of any of the
 /// aforementioned values, like `red` or `brightgreen`.
 ///
-/// Note that `gix-config` allows color values to simply be a collection of
+/// Note that `git-config` allows color values to simply be a collection of
 /// [`color::Attribute`]s, and does not require a [`color::Name`] for either the
 /// foreground or background color.
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Default)]