[PATCH 4/6] user-manual: fix .gitconfig editing examples

[PATCH 4/6] user-manual: fix .gitconfig editing examples

[J. Bruce Fields]

From: J. Bruce Fields <bfields@citi.umich.edu>

Santi Béjar points out that when telling people how to "introduce
themselves" to git we're advising them to replace their entire
.gitconfig file.  Fix that.

Cc: "Santi Béjar <sbejar@gmail.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
 Documentation/user-manual.txt |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 03206c5..c292b4d 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -158,7 +158,7 @@ Making changes
 Make sure git knows who to blame:
 
 ------------------------------------------------
-$ cat >~/.gitconfig <<\EOF
+$ cat >>~/.gitconfig <<\EOF
 [user]
 	name = Your Name Comes Here
 	email = you@yourdomain.example.com
@@ -1049,14 +1049,13 @@ Telling git your name
 ---------------------
 
 Before creating any commits, you should introduce yourself to git.  The
-easiest way to do so is:
+easiest way to do so is to make sure the following lines appear in a
+file named .gitconfig in your home directory:
 
 ------------------------------------------------
-$ cat >~/.gitconfig <<\EOF
 [user]
 	name = Your Name Comes Here
 	email = you@yourdomain.example.com
-EOF
 ------------------------------------------------
 
 (See the "CONFIGURATION FILE" section of gitlink:git-config[1] for
-- 
1.5.1.1.98.gedb4f

Re: [PATCH 4/6] user-manual: fix .gitconfig editing examples

[Karl Hasselström]

On 2007-05-07 01:14:00 -0400, J. Bruce Fields wrote:

> Santi Béjar points out that

You seem to have broken his name in this and at least one other patch.
(By the looks of it, you seem to have interpreted a utf8 byte sequence
as latin1.)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [PATCH 4/6] user-manual: fix .gitconfig editing examples

[Santi Béjar]

On 5/7/07, Karl Hasselström <kha@treskal.com> wrote:
> On 2007-05-07 01:14:00 -0400, J. Bruce Fields wrote:
>
> > Santi BÃ(c)jar points out that
>
> You seem to have broken his name in this and at least one other patch.
> (By the looks of it, you seem to have interpreted a utf8 byte sequence
> as latin1.)

I see it OK. Both in the mail and in the repo.

Santi

>
> --
> Karl Hasselström, kha@treskal.com
>       www.treskal.com/kalle

Re: [PATCH 4/6] user-manual: fix .gitconfig editing examples

[Karl Hasselström]

On 2007-05-07 09:29:23 +0200, Santi Béjar wrote:

> I see it OK. Both in the mail and in the repo.

The headers said, among other things,

  Content-Transfer-Encoding: QUOTED-PRINTABLE
  Content-Type: TEXT/PLAIN; charset=ISO-8859-1

and the raw text of the body was

  Santi B=C3=A9jar points out that

Note how the "é" in your name is encoded with two bytes.

But if it's not broken in the repository, it's probably nothing to
worry about. :-)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [PATCH 4/6] user-manual: fix .gitconfig editing examples

[Santi Béjar]

On 5/7/07, Karl Hasselström <kha@treskal.com> wrote:
> On 2007-05-07 09:29:23 +0200, Santi Béjar wrote:
>
> > I see it OK. Both in the mail and in the repo.
>
> The headers said, among other things,
>
>   Content-Transfer-Encoding: QUOTED-PRINTABLE
>   Content-Type: TEXT/PLAIN; charset=ISO-8859-1
>

My headers say:

Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

> and the raw text of the body was
>
>   Santi B=C3=A9jar points out that
>
> Note how the "é" in your name is encoded with two bytes.
>
> But if it's not broken in the repository, it's probably nothing to
> worry about. :-)

Or +1 for a git log that uses .mailcap in the commit message :-D

Santi

Re: [PATCH 4/6] user-manual: fix .gitconfig editing examples

[Karl Hasselström]

On 2007-05-07 11:33:28 +0200, Santi Béjar wrote:

> On 5/7/07, Karl Hasselström <kha@treskal.com> wrote:
>
> > On 2007-05-07 09:29:23 +0200, Santi Béjar wrote:
> >
> > > I see it OK. Both in the mail and in the repo.
> >
> > The headers said, among other things,
> >
> >   Content-Transfer-Encoding: QUOTED-PRINTABLE
> >   Content-Type: TEXT/PLAIN; charset=ISO-8859-1
>
> My headers say:
>
> Content-Type: text/plain; charset=utf-8
> Content-Transfer-Encoding: 8bit

Hmm. Someone's rewriting it, then. vger used to do that to my patches
for quite some time, until "stg mail" learned to write mails just
right.

Life would be so much simpler if e-mails just got sent from point A to
point B _without_ getting rewritten at every hop ...

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle