Re: [PATCH 5/6] user-manual: miscellaneous editing

On 5/7/07, J. Bruce Fields [off-list ref] wrote:

From: J. Bruce Fields <redacted>

I cherry-picked some additional miscellaneous fixes from those suggested
by Santi Béjar, including fixes to:

        - correct discussion of repository/HEAD->repository shortcut
        - add mention of git-mergetool
        - add mention of --track
        - mention "-f" as well as "+" for fetch

Cc: Santi Béjar <redacted>

You forgot to CC: the e-mail to me :-)

[...]

You missed the ~/proj as in:

$ git clone --bare ~/proj proj.git

What do you think about the rest of my changes, in particular:

@@ -2374,7 +2388,6 @@ then the following commands will all do the same thing:
 -------------------------------------------------
 $ git fetch git://example.com/proj.git master:ref/remotes/example/master
 $ git fetch example master:ref/remotes/example/master
-$ git fetch example example/master
 $ git fetch example
 -------------------------------------------------

Santi

On Mon, May 07, 2007 at 09:27:40AM +0200, Santi Béjar wrote:

On 5/7/07, J. Bruce Fields [off-list ref] wrote:

quoted

Cc: Santi Béjar <redacted>

You forgot to CC: the e-mail to me :-)

The version of git-send-email I was using is supposed to do that
automatically based on the inlined Cc: line.  Did it not do that?

quoted

@@ -1830,14 +1836,14 @@ Now, assume your personal repository is in the 

directory ~/proj.  We
first create a new clone of the repository:

-------------------------------------------------
-$ git clone --bare proj-clone.git
+$ git clone --bare proj.git
-------------------------------------------------

You missed the ~/proj as in:

$ git clone --bare ~/proj proj.git

Whoops, thanks.

Yes, you're correct, thanks for your persistence.

The others--I don't remember.  I'll take a quick look.  If you want to
be sure they'll all be considered, you could update the patch and
resend.

--b.

More typo fixes from Santi Béjar, plus a couple other mistakes I noticed
along the way.

Cc: Santi Béjar <redacted>
Signed-off-by: "J. Bruce Fields" <redacted>
---
 Documentation/user-manual.txt |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 67f5b9b..13db969 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt

@@ -1836,12 +1836,12 @@ Now, assume your personal repository is in the directory ~/proj.  We
 first create a new clone of the repository:
 
 -------------------------------------------------
-$ git clone --bare proj.git
+$ git clone --bare ~/proj proj.git
 -------------------------------------------------
 
-The resulting directory proj.git will contains a "bare" git
-repository--it is just the contents of the ".git" directory, without
-a checked-out copy of a working directory.
+The resulting directory proj.git contains a "bare" git repository--it is
+just the contents of the ".git" directory, without a checked-out copy of
+a working directory.
 
 Next, copy proj.git to the server where you plan to host the
 public repository.  You can use scp, rsync, or whatever is most

@@ -2372,9 +2372,8 @@ $ git config remote.example.fetch master:refs/remotes/example/master
 then the following commands will all do the same thing:
 
 -------------------------------------------------
-$ git fetch git://example.com/proj.git master:ref/remotes/example/master
-$ git fetch example master:ref/remotes/example/master
-$ git fetch example example/master
+$ git fetch git://example.com/proj.git master:refs/remotes/example/master
+$ git fetch example master:refs/remotes/example/master
 $ git fetch example
 -------------------------------------------------
 

-- 
1.5.1.1.98.gedb4f

On Mon, May 07, 2007 at 11:34:26PM -0400, J. Bruce Fields wrote:

More typo fixes from Santi Béjar, plus a couple other mistakes I noticed
along the way.

Cc: Santi Béjar <redacted>
Signed-off-by: "J. Bruce Fields" <redacted>

Hm.  I still see

	Content-Type:   text/plain; charset=iso-8859-1

in the headers, even in the copy saved in my sent-mail folder.  My
locale seems to be set to something utf-8-ish everywhere, though.  Is
there some odd mutt configuration setting I'm missing someplace?
Character sets mystify me....

--b.

On 2007-05-07 23:41:29 -0400, J. Bruce Fields wrote:

Hm.  I still see

      Content-Type:   text/plain; charset=iso-8859-1

in the headers

But this time, it looks good to me. This is probably because the
headers say the body is QP-encoded latin1:

  Content-Type:   text/plain; charset=iso-8859-1
  Content-Transfer-Encoding: QUOTED-PRINTABLE

and the body actually _is_ QP-encoded latin1:

  More typo fixes from Santi B=E9jar

Note how the "é" is encoded with only one byte this time, like it's
supposed to in latin1.

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