Junio C Hamano <gitster@xxxxxxxxx> writes: > Probably a good idea; I do not think of any possible interactions we > have to worry about with the configuration file init-db creates with > possible templating. The feature should trigger only for --global, so it shouldn't interfer with .git/config and templates. > Do we use "user-wide" as a phrase to refer to these? It sounds > somewhat funny to call anything specific to $frotz "$frotz-wide", at > least to me. > > Surely, /etc/gitconfig is called "site-wide". But .git/config is > per-project (or project-specific), and I would always have thought > that ~/.gitconfig was "per-user". I'm not a native speaker, but to me, "user-wide" insists on the fact that it applies to everything for this user, and "per-user" insists on the fact that it does not apply to other users. Perhaps just "Git's user configuration file" would be enough. >> builtin/config.c | 30 +++++++++++++++++++++++++++--- >> cache.h | 1 + >> ident.c | 2 +- >> 3 files changed, 29 insertions(+), 4 deletions(-) >> >> diff --git a/builtin/config.c b/builtin/config.c >> index fcd8474..3821697 100644 >> --- a/builtin/config.c >> +++ b/builtin/config.c >> @@ -445,6 +445,20 @@ static int get_urlmatch(const char *var, const char *url) >> return 0; >> } >> >> +static char *default_user_config() > > static char *default_user_config(void) Right. Doing too much C++. >> +{ >> + struct strbuf buf = STRBUF_INIT; >> + strbuf_addf(&buf, >> + _("# This is Git's user-wide configuration file.\n" >> + "[core]\n" >> + "# Please, adapt and uncomment the following lines:\n" > > tangent: is it a French tradition to always have comma after please? Perhaps. In French, the comma would be required after "S'il vous plait" (litterally, "if you like"). I'll remove it. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html