Little fix and suggestion for the git tutorial

Little fix and suggestion for the git tutorial

[Carlos Rica]

Sorry for not sending a patch, I was following the tutorial and found
this, in the section "Using git for collaboration":

 307 With this, you can perform the first operation alone using the
 308 "git fetch" command without merging them with her own branch,
 309 using:

I think that "you" should be replaced with "she".

I have a suggestion also that I don't know how to fix. The text in
that section seems to say something like you need to add a "remote"
alias to be able to run fetch for retrieving without merging:

...[remote add <alias>]...

 307 With this, you can perform the first operation alone using the
 308 "git fetch" command without merging them with her own branch,
 309 using:

....[fetch <alias>]...

 315 Unlike the longhand form, when Alice fetches from Bob using a
 316 remote repository shorthand set up with `git remote`, what was
 317 fetched is stored in a remote tracking branch, in this case
 318 `bob/master`.  So after this:

I'm not sure, but I think that you could use fetch without the need of
an alias. I think that here it is trying to avoid more advanced
explanations or longer commands, however I don't know how to say it
better, perhaps mentioning that this way it is easier, without
omitting that it could be done without a "remote" alias for the repo.

That's all, thank you

Re: Little fix and suggestion for the git tutorial

[J. Bruce Fields]

On Thu, Jun 21, 2007 at 06:45:01PM +0200, Carlos Rica wrote:
> Sorry for not sending a patch, I was following the tutorial and found
> this, in the section "Using git for collaboration":
> 
> 307 With this, you can perform the first operation alone using the
> 308 "git fetch" command without merging them with her own branch,
> 309 using:
> 
> I think that "you" should be replaced with "she".

Yep, thanks.  Actually, I think we should make it "Alice".

> I have a suggestion also that I don't know how to fix. The text in
> that section seems to say something like you need to add a "remote"
> alias to be able to run fetch for retrieving without merging:

Yes, I agree, it's confusing.  We're trying to introduce both fetch and
remotes at the same time.

It might be the simplest thing to do would just be to use remotes from
the start.  I don't know.  I haven't looked at this section in a
while--I'll try to find time this weekend and see if I can come up with
a better approach.

--b.