user-manual: miscellaneous editing
A message that is not in the archive (sent off-list or not yet received): -1060540797535999820@unknownmsgid
Quoted 5 lines · J. Bruce Fields
From: J. Bruce Fields <[email protected]>
I cherry-picked some additional miscellaneous fixes from those suggested by Santi Béjar, including fixes to:
Quoted 7 lines
- correct discussion of repository/HEAD->repository shortcut
- add mention of git-mergetool
- add mention of --track
- mention "-f" as well as "+" for fetchCc Santi Béjar <[email protected]>
You forgot to CC: the e-mail to me :-)
Quoted 4 lines
Documentation/user-manual.txt +0
-0
[...]
Documentation/user-manual.txt Now, assume your personal repository is in the directory ~/proj. We · line 1840
Quoted 7 lines
Documentation/user-manual.txt +1
-1@@ -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
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
Quoted 4 lines · Santi Béjar
Quoted 1 line · J. Bruce Fields
Cc Santi Béjar <[email protected]>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 4 lines
Quoted 4 lines
(quoted diff) +0
-0@@ -1830,14 +1836,14 @@ Now, assume your personal repository is in thedirectory ~/proj. We
first create a new clone of the repository:
Quoted 8 lines
Quoted 4 lines
-------------------------------------------------
-$ 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.
Quoted 10 lines
What do you think about the rest of my changes, in particular:
(quoted diff) +0
-0@@ -2374,7 +2388,6 @@ then the following commands will all do the samething:
-------------------------------------------------$ 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 -------------------------------------------------
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.
PATCH 1/1 user-manual: fix clone and fetch typos
More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way.
--- Documentation/user-manual.txt | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
Documentation/user-manual.txt +6 -7
@@ -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 -------------------------------------------------
Signature · 1 line
1.5.1.1.98.gedb4f
Re: [PATCH] user-manual: fix clone and fetch typos
Quoted 5 lines · J. Bruce Fields
More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way.
Cc Santi Béjar <[email protected]>Signed-off-by "J. Bruce Fields" <[email protected]>
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.
Re: [PATCH] user-manual: fix clone and fetch typos
Quoted 5 lines · J. Bruce Fields
Hm. I still see
Content-Type: text/plain; charset=iso-8859-1in 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.
Signature · 2 lines
Karl Hasselström, [email protected] www.treskal.com/kalle