# Re: [PATCH 5/6] user-manual: miscellaneous editing 5 messages from 2007-05-07 to 2007-05-08. Participants: Santi Béjar, J. Bruce Fields, Karl Hasselström. Thread: https://gitlist.dev/t/8014 ## Santi Béjar, 2007-05-07 07:27 Subject: Re: [PATCH 5/6] user-manual: miscellaneous editing Message-ID: <8aa486160705070027g2cb6797fy5acbe338e30429ff@mail.gmail.com> URL: https://gitlist.dev/e/8aa486160705070027g2cb6797fy5acbe338e30429ff%40mail.gmail.com In-Reply-To: <-1060540797535999820@unknownmsgid> ``` On 5/7/07, J. Bruce Fields wrote: > From: J. Bruce Fields > > 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 You forgot to CC: the e-mail to me :-) > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index c292b4d..67f5b9b 100644 > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt [...] > @@ -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 ``` ## J. Bruce Fields, 2007-05-08 03:07 Subject: Re: [PATCH 5/6] user-manual: miscellaneous editing Message-ID: <20070508030732.GB9471@fieldses.org> URL: https://gitlist.dev/e/20070508030732.GB9471%40fieldses.org In-Reply-To: <8aa486160705070027g2cb6797fy5acbe338e30429ff@mail.gmail.com> ``` On Mon, May 07, 2007 at 09:27:40AM +0200, Santi Béjar wrote: > On 5/7/07, J. Bruce Fields wrote: > >Cc: Santi Béjar > > 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? > >@@ -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. > 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 > ------------------------------------------------- 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. ``` ## J. Bruce Fields, 2007-05-08 03:34 Subject: [PATCH] user-manual: fix clone and fetch typos Message-ID: <20070508033426.GD9471@fieldses.org> URL: https://gitlist.dev/e/20070508033426.GD9471%40fieldses.org In-Reply-To: <20070508030732.GB9471@fieldses.org> ``` More typo fixes from Santi Béjar, plus a couple other mistakes I noticed along the way. Cc: Santi Béjar Signed-off-by: "J. Bruce Fields" --- 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 ``` ## J. Bruce Fields, 2007-05-08 03:41 Subject: Re: [PATCH] user-manual: fix clone and fetch typos Message-ID: <20070508034129.GE9471@fieldses.org> URL: https://gitlist.dev/e/20070508034129.GE9471%40fieldses.org In-Reply-To: <20070508033426.GD9471@fieldses.org> ``` 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 > Signed-off-by: "J. Bruce Fields" 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. ``` ## Karl Hasselström, 2007-05-08 10:12 Subject: Re: [PATCH] user-manual: fix clone and fetch typos Message-ID: <20070508101237.GA27119@diana.vm.bytemark.co.uk> URL: https://gitlist.dev/e/20070508101237.GA27119%40diana.vm.bytemark.co.uk In-Reply-To: <20070508034129.GE9471@fieldses.org> ``` 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 ```