diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-06 23:20:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-06 23:20:18 -0800 |
| commit | 08e1812db1585c450bfe7f41e7106222346c88da (patch) | |
| tree | bd403178f2f16dfe458cb5852f7e8e50fc038c61 | |
| parent | c7860507f0b8974359616d7047f76f1723843156 (diff) | |
| parent | 8e7425da782cbdff4531d84e0ef4ec7bd3ae23d7 (diff) | |
| download | git-08e1812db1585c450bfe7f41e7106222346c88da.tar.gz | |
Merge branch 'maint'
* maint:
Change from using email.com to example.com as example domain, as per RFC 2606.
| -rw-r--r-- | Documentation/SubmittingPatches | 2 | ||||
| -rw-r--r-- | ident.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 83bf54c7ac..de08d094e3 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -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 @@ -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" |