git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] docs: note the type of core.attributesfile
@ 2025-12-17 19:51 Matthew Hughes
  2025-12-17 19:53 ` Matthew Hughes
  2025-12-17 19:59 ` [PATCH v2] " Matthew Hughes
  0 siblings, 2 replies; 4+ messages in thread
From: Matthew Hughes @ 2025-12-17 19:51 UTC (permalink / raw)
  To: git; +Cc: Matthew Hughes

The previous wording:

> Path expansions are made the same way as for `core.excludesFile`.

required one to check the docs for 'core.excludesFile' and from there
the definition of the pathname variable type to understand the path
expansion behaviour of this variable. Instead, just link directly to the
pathname type.

This change is basically the same rewording as was done to
'core.excludesFile' in dca83abde2 (config: describe 'pathname' value
type).
---
 Documentation/config/core.adoc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc
index 01202da7cd..9bc9de29d9 100644
--- a/Documentation/config/core.adoc
+++ b/Documentation/config/core.adoc
@@ -492,10 +492,9 @@ core.askPass::
 	command-line argument and write the password on its STDOUT.
 
 core.attributesFile::
-	In addition to `.gitattributes` (per-directory) and
-	`.git/info/attributes`, Git looks into this file for attributes
-	(see linkgit:gitattributes[5]). Path expansions are made the same
-	way as for `core.excludesFile`. Its default value is
+	Specifies the pathname to the file that contains attributes (see
+	linkgit:gitattributes[5]), in addition to `.gitattributes` (per-directory)
+	and `.git/info/attributes`. Its default value is
 	`$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not
 	set or empty, `$HOME/.config/git/attributes` is used instead.
 
-- 
2.52.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] docs: note the type of core.attributesfile
  2025-12-17 19:51 [PATCH] docs: note the type of core.attributesfile Matthew Hughes
@ 2025-12-17 19:53 ` Matthew Hughes
  2025-12-17 19:59 ` [PATCH v2] " Matthew Hughes
  1 sibling, 0 replies; 4+ messages in thread
From: Matthew Hughes @ 2025-12-17 19:53 UTC (permalink / raw)
  To: git

On Wed, Dec 17, 2025 at 07:51:10PM +0000, Matthew Hughes wrote:
> ---
>  Documentation/config/core.adoc | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

I forgot (again!) to signoff the commit, I'll do that and reroll this patch

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH v2] docs: note the type of core.attributesfile
  2025-12-17 19:51 [PATCH] docs: note the type of core.attributesfile Matthew Hughes
  2025-12-17 19:53 ` Matthew Hughes
@ 2025-12-17 19:59 ` Matthew Hughes
  2025-12-18  0:15   ` Junio C Hamano
  1 sibling, 1 reply; 4+ messages in thread
From: Matthew Hughes @ 2025-12-17 19:59 UTC (permalink / raw)
  To: git; +Cc: Matthew Hughes

The previous wording:

> Path expansions are made the same way as for `core.excludesFile`.

required one to check the docs for 'core.excludesFile' and from there
the definition of the pathname variable type to understand the path
expansion behaviour of this variable. Instead, just link directly to the
pathname type.

This change is basically the same rewording as was done to
'core.excludesFile' in dca83abde2 (config: describe 'pathname' value
type).

Signed-off-by: Matthew Hughes <matthewhughes934@gmail.com>
---
 Documentation/config/core.adoc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc
index 01202da7cd..9bc9de29d9 100644
--- a/Documentation/config/core.adoc
+++ b/Documentation/config/core.adoc
@@ -492,10 +492,9 @@ core.askPass::
 	command-line argument and write the password on its STDOUT.
 
 core.attributesFile::
-	In addition to `.gitattributes` (per-directory) and
-	`.git/info/attributes`, Git looks into this file for attributes
-	(see linkgit:gitattributes[5]). Path expansions are made the same
-	way as for `core.excludesFile`. Its default value is
+	Specifies the pathname to the file that contains attributes (see
+	linkgit:gitattributes[5]), in addition to `.gitattributes` (per-directory)
+	and `.git/info/attributes`. Its default value is
 	`$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not
 	set or empty, `$HOME/.config/git/attributes` is used instead.
 
-- 
2.52.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] docs: note the type of core.attributesfile
  2025-12-17 19:59 ` [PATCH v2] " Matthew Hughes
@ 2025-12-18  0:15   ` Junio C Hamano
  0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2025-12-18  0:15 UTC (permalink / raw)
  To: Matthew Hughes; +Cc: git

Matthew Hughes <matthewhughes934@gmail.com> writes:

> This change is basically the same rewording as was done to
> 'core.excludesFile' in dca83abde2 (config: describe 'pathname' value
> type).

Indeed, when we look at Documentation/config.txt in the commit
immediately before that one, the description for core.excludesFile
and core.attributesFile starts quite similarly.  The old commit 
dca83abd (config: describe 'pathname' value type, 2016-04-29) should
have done this already back then when it touched core.excludesFile.

Will queue.  Thanks.


> Signed-off-by: Matthew Hughes <matthewhughes934@gmail.com>
> ---
>  Documentation/config/core.adoc | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc
> index 01202da7cd..9bc9de29d9 100644
> --- a/Documentation/config/core.adoc
> +++ b/Documentation/config/core.adoc
> @@ -492,10 +492,9 @@ core.askPass::
>  	command-line argument and write the password on its STDOUT.
>  
>  core.attributesFile::
> -	In addition to `.gitattributes` (per-directory) and
> -	`.git/info/attributes`, Git looks into this file for attributes
> -	(see linkgit:gitattributes[5]). Path expansions are made the same
> -	way as for `core.excludesFile`. Its default value is
> +	Specifies the pathname to the file that contains attributes (see
> +	linkgit:gitattributes[5]), in addition to `.gitattributes` (per-directory)
> +	and `.git/info/attributes`. Its default value is
>  	`$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not
>  	set or empty, `$HOME/.config/git/attributes` is used instead.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-12-18  0:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-17 19:51 [PATCH] docs: note the type of core.attributesfile Matthew Hughes
2025-12-17 19:53 ` Matthew Hughes
2025-12-17 19:59 ` [PATCH v2] " Matthew Hughes
2025-12-18  0:15   ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).