Merge branch 'maint'

* maint:
  Change from using email.com to example.com as example domain, as per RFC 2606.
This commit is contained in:
Junio C Hamano 2007-12-06 23:20:18 -08:00
commit 08e1812db1
2 changed files with 2 additions and 2 deletions

View file

@ -10,7 +10,7 @@ Checklist (and a short version for the impatient):
- the first line of the commit message should be a short
description and should skip the full stop
- if you want your work included in git.git, add a
"Signed-off-by: Your Name <your@email.com>" line to the
"Signed-off-by: Your Name <you@example.com>" line to the
commit message (or just use the option "-s" when
committing) to confirm that you agree to the Developer's
Certificate of Origin

View file

@ -175,7 +175,7 @@ static const char *env_hint =
"\n"
"Run\n"
"\n"
" git config --global user.email \"you@email.com\"\n"
" git config --global user.email \"you@example.com\"\n"
" git config --global user.name \"Your Name\"\n"
"\n"
"to set your account\'s default identity.\n"