threads / patch / 8014

patch, 6 partsRe: [PATCH 5/6] user-manual: miscellaneous editing

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

## tl;dr

5 messages between May 7, 2007 and May 8, 2007. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Santi Béjar· May 7, 2007, 07:27 UTC · lore
On 5/7/07, J. Bruce Fields <bfields@citi.umich.edu> wrote:
Show 10 quoted lines
> From: J. Bruce Fields <bfields@citi.umich.edu>
>
> 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 <sbejar@gmail.com>
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
[...]
Show 7 quoted lines
> @@ -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:
Show changes to diff +0 −1
@@ -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· May 8, 2007, 03:07 UTC · re: Santi Béjar · lore
On Mon, May 07, 2007 at 09:27:40AM +0200, Santi Béjar wrote:
> On 5/7/07, J. Bruce Fields <bfields@citi.umich.edu> wrote:
> >Cc: Santi Béjar <sbejar@gmail.com>
>
> 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?

Show 12 quoted lines
> >@@ -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.
Show 10 quoted lines
> 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· May 8, 2007, 03:34 UTC · re: J. Bruce Fields · lore

[PATCH] user-manual: fix clone and fetch typos

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

Cc: Santi Béjar <sbejar@gmail.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
 Documentation/user-manual.txt |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
Show changes to Documentation/user-manual.txt +6 −7
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· May 8, 2007, 03:41 UTC · re: J. Bruce Fields · lore

Re: [PATCH] user-manual: fix clone and fetch typos

On Mon, May 07, 2007 at 11:34:26PM -0400, J. Bruce Fields wrote:
Show 5 quoted lines
> More typo fixes from Santi Béjar, plus a couple other mistakes I noticed
> along the way.
> 
> Cc: Santi Béjar <sbejar@gmail.com>
> Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
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· May 8, 2007, 10:12 UTC · re: J. Bruce Fields · lore

Re: [PATCH] user-manual: fix clone and fetch typos

On 2007-05-07 23:41:29 -0400, J. Bruce Fields wrote:
Show 5 quoted lines
> 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

← back to recent threads