{"thread":{"id":"32905","subject":"[PATCH] git.txt: update description of the configuration mechanism","startedAt":"2013-02-14T15:36:54Z","lastAt":"2013-02-15T08:18:28Z","messageCount":8,"participants":["Matthieu Moy","Michael J Gruber","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"209518","messageId":"1360856214-934-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"32905","inReplyTo":null,"subject":"[PATCH] git.txt: update description of the configuration mechanism","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2013-02-14T15:36:54Z","receivedAt":"2013-02-14T15:36:54Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"The old Git version where it appeared is not useful only to historians,\nnot to normal users. Also, the text was mentioning only the per-repo\nconfig file, so add a mention of ~/.gitconfig. Describing in details the\nsystem-wide, XDG and all would be counter-productive here, so reword the\ndescription of the link to git-config to make it clear that it is not\nonly a list of configuration options.\n\nSigned-off-by: Matthieu Moy \n---\n Documentation/git.txt | 11 ++++++-----\n 1 file changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 0b681d9..e332947 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -535,10 +535,11 @@ include::cmds-purehelpers.txt[]\n Configuration Mechanism\n -----------------------\n \n-Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file\n-is used to hold per-repository configuration options. It is a\n-simple text file modeled after `.ini` format familiar to some\n-people. Here is an example:\n+Git uses a simple text file format modeled after `.ini` format\n+familiar to some people to store its configuration. The `.git/config`\n+file is used to hold per-repository configuration options, and\n+per-user configuration can be stored in a `~/.gitconfig` file.\n+Here is an example:\n \n ------------\n #\n@@ -559,7 +560,7 @@ people. Here is an example:\n \n Various commands read from the configuration file and adjust\n their operation accordingly. See linkgit:git-config[1] for a\n-list.\n+list and more details about the configuration mechanism.\n \n \n Identifier Terminology\n-- \n1.8.1.3.572.g35e1b60\n"},{"id":"209525","messageId":"511D0D88.6010302@drmicha.warpmail.net","threadId":"32905","inReplyTo":"1360856214-934-1-git-send-email-Matthieu.Moy@imag.fr","subject":"Re: [PATCH] git.txt: update description of the configuration mechanism","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2013-02-14T16:15:04Z","receivedAt":"2013-02-14T16:15:04Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Matthieu Moy venit, vidit, dixit 14.02.2013 16:36:\n> The old Git version where it appeared is not useful only to historians,\n> not to normal users. Also, the text was mentioning only the per-repo\n\nI do not think you meant to not remove so many nots ;)\n\nBesides, if history is uninteresting, then so is sociology: \"familiar to\nsome people\" can go, too.\n\n> config file, so add a mention of ~/.gitconfig. Describing in details the\n> system-wide, XDG and all would be counter-productive here, so reword the\n\nHmpf, I think this gives a way too prominent role to \"~/.gitconfig\". The\nconfig files most people will have to deal with are:\n\n- the repo config file\n- the one set by \"config --global\"\n\nAnd really, it would often be best if the latter was the XDG thing.\n\nSo, I'm all for improving git.txt, but somewhat differently ;)\n\n> description of the link to git-config to make it clear that it is not\n> only a list of configuration options.\n> \n> Signed-off-by: Matthieu Moy \n> ---\n> Documentation/git.txt | 11 ++++++-----\n> 1 file changed, 6 insertions(+), 5 deletions(-)\n> \n> diff --git a/Documentation/git.txt b/Documentation/git.txt\n> index 0b681d9..e332947 100644\n> --- a/Documentation/git.txt\n> +++ b/Documentation/git.txt\n> @@ -535,10 +535,11 @@ include::cmds-purehelpers.txt[]\n> Configuration Mechanism\n> -----------------------\n> \n> -Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file\n> -is used to hold per-repository configuration options. It is a\n> -simple text file modeled after `.ini` format familiar to some\n> -people. Here is an example:\n> +Git uses a simple text file format modeled after `.ini` format\n> +familiar to some people to store its configuration. The `.git/config`\n> +file is used to hold per-repository configuration options, and\n> +per-user configuration can be stored in a `~/.gitconfig` file.\n> +Here is an example:\n> \n> ------------\n> #\n> @@ -559,7 +560,7 @@ people. Here is an example:\n> \n> Various commands read from the configuration file and adjust\n> their operation accordingly. See linkgit:git-config[1] for a\n> -list.\n> +list and more details about the configuration mechanism.\n> \n> \n> Identifier Terminology\n> \n"},{"id":"209526","messageId":"vpqzjz6ampm.fsf@grenoble-inp.fr","threadId":"32905","inReplyTo":"511D0D88.6010302@drmicha.warpmail.net","subject":"Re: [PATCH] git.txt: update description of the configuration mechanism","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-02-14T16:23:33Z","receivedAt":"2013-02-14T16:23:33Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Michael J Gruber writes:\n\n> Matthieu Moy venit, vidit, dixit 14.02.2013 16:36:\n>> The old Git version where it appeared is not useful only to historians,\n>> not to normal users. Also, the text was mentioning only the per-repo\n>\n> I do not think you meant to not remove so many nots ;)\n\nThe first was meant to be \"now\", indeed.\n\n> Besides, if history is uninteresting, then so is sociology: \"familiar to\n> some people\" can go, too.\n\nIt can, but I'm fine with keeping it too. It may help some users to\nrealize \"ah, OK, the same ini file I'm used to\". And it doesn't really\nharm.\n\n>> config file, so add a mention of ~/.gitconfig. Describing in details the\n>> system-wide, XDG and all would be counter-productive here, so reword the\n>\n> Hmpf, I think this gives a way too prominent role to \"~/.gitconfig\". The\n> config files most people will have to deal with are:\n>\n> - the repo config file\n> - the one set by \"config --global\"\n>\n> And really, it would often be best if the latter was the XDG thing.\n\nThat's a different question. For now, ~/.gitconfig is the default\ndestination of \"config --global\" and we should wait for XDG-aware Gits\nto be widely deployed before reconsidering that.\n\nIf the XDG config file ever become the default, then sure, it will have\nto be promoted instead of ~/.gitconfig in git.txt (and I'll be all for\nit when it's time, even though I can foresee a few flamewars ;-) ), but\nI don't think we should do that now.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"209529","messageId":"7vhale3kii.fsf@alter.siamese.dyndns.org","threadId":"32905","inReplyTo":"1360856214-934-1-git-send-email-Matthieu.Moy@imag.fr","subject":"Re: [PATCH] git.txt: update description of the configuration mechanism","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-14T16:52:53Z","receivedAt":"2013-02-14T16:52:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> The old Git version where it appeared is not useful only to historians,\n> not to normal users.\n\nThat statement cannot be generally true, unless the \"old\" is really\nold and no longer relevant but 0.99.9 is sufficiently old so the\nvalue of the part of the message you removed that warns users with\nancient versions that they may not be able to use the feature\nwithout upgrading has diminished.\n\n> +Git uses a simple text file format modeled after `.ini` format\n> +familiar to some people to store its configuration. The `.git/config`\n> +file is used to hold per-repository configuration options, and\n> +per-user configuration can be stored in a `~/.gitconfig` file.\n> +Here is an example:\n> \n> ------------\n> #\n> @@ -559,7 +560,7 @@ people. Here is an example:\n> \n> Various commands read from the configuration file and adjust\n> their operation accordingly. See linkgit:git-config[1] for a\n> -list.\n> +list and more details about the configuration mechanism.\n\nBoth look sensible.\n"},{"id":"209532","messageId":"7v4nhe3joq.fsf@alter.siamese.dyndns.org","threadId":"32905","inReplyTo":"vpqzjz6ampm.fsf@grenoble-inp.fr","subject":"Re: [PATCH] git.txt: update description of the configuration mechanism","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-14T17:10:45Z","receivedAt":"2013-02-14T17:10:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> If the XDG config file ever become the default, then sure, it will have\n> to be promoted instead of ~/.gitconfig in git.txt (and I'll be all for\n> it when it's time, even though I can foresee a few flamewars ;-) ), but\n> I don't think we should do that now.\n\nWe are giving an overview to list what things are possible and what\nwords the reader should be familiar with in this part of the manual.\nThe fact that configuration can be done per user and per repository\nis a relevant thing to know at the conceptual level.\n\nBut the exact location of per-user and per-repository configuration\nfiles does not matter in this context and is best left to the\ngit-config documentation.\n\n\n Documentation/git.txt | 11 +++++------\n 1 file changed, 5 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 0b681d9..2d975e3 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -535,10 +535,9 @@ include::cmds-purehelpers.txt[]\n Configuration Mechanism\n -----------------------\n \n-Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file\n-is used to hold per-repository configuration options. It is a\n-simple text file modeled after `.ini` format familiar to some\n-people. Here is an example:\n+Git uses a simple text format to store customizations that are per\n+repository and are per user. Such a configuration file may look\n+like this:\n \n ------------\n #\n@@ -553,13 +552,13 @@ people. Here is an example:\n ; user identity\n [user]\n \tname = \"Junio C Hamano\"\n-\temail = \"junkio@twinsun.com\"\n+\temail = \"gitster@pobox.com\"\n \n ------------\n \n Various commands read from the configuration file and adjust\n their operation accordingly. See linkgit:git-config[1] for a\n-list.\n+list and more details about the configuration mechanism.\n \n \n Identifier Terminology\n"},{"id":"209534","messageId":"vpqy5eq94rq.fsf@grenoble-inp.fr","threadId":"32905","inReplyTo":"7v4nhe3joq.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] git.txt: update description of the configuration mechanism","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-02-14T17:36:25Z","receivedAt":"2013-02-14T17:36:25Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Junio C Hamano writes:\n\n> But the exact location of per-user and per-repository configuration\n> files does not matter in this context and is best left to the\n> git-config documentation.\n\nI'm OK with your version.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"209536","messageId":"7vvc9u22p6.fsf@alter.siamese.dyndns.org","threadId":"32905","inReplyTo":"vpqy5eq94rq.fsf@grenoble-inp.fr","subject":"Re: [PATCH] git.txt: update description of the configuration mechanism","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-14T18:03:01Z","receivedAt":"2013-02-14T18:03:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> Junio C Hamano writes:\n>\n>> But the exact location of per-user and per-repository configuration\n>> files does not matter in this context and is best left to the\n>> git-config documentation.\n>\n> I'm OK with your version.\n\nI already queued your original with one s/not/now/; perhaps I will\nredo it then.\n"},{"id":"209548","messageId":"511DEF54.5040407@drmicha.warpmail.net","threadId":"32905","inReplyTo":"7vvc9u22p6.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] git.txt: update description of the configuration mechanism","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2013-02-15T08:18:28Z","receivedAt":"2013-02-15T08:18:28Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 14.02.2013 19:03:\n> Matthieu Moy writes:\n> \n>> Junio C Hamano writes:\n>>\n>>> But the exact location of per-user and per-repository configuration\n>>> files does not matter in this context and is best left to the\n>>> git-config documentation.\n>>\n>> I'm OK with your version.\n> \n> I already queued your original with one s/not/now/; perhaps I will\n> redo it then.\n\nYes, I think the new version improves upon Matthieu's which was a good\nstart to begin with :)\n\nMichael\n"}]}