Re: [PATCH 09/11] user-manual.txt: explain better the remote(-tracking) branch terms

Jonathan Nieder [off-list ref] writes:

Matthieu Moy wrote:

quoted

--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt

@@ -359,6 +360,14 @@ $ git branch -r
   origin/todo
 ------------------------------------------------
 
+In this case, "origin" is called a remote repository, or "remote" for

[...]

Did you send the wrong patch?  This looks the same as last time.

Nice catch. I had squashed my changes into the wrong patch (if you
look closely, it ended up in patch 10/11).

Also, after looking more closely, you're right about squashing the
changes in fetch and fmt-merge-msg, I do introduce a (transcient,
untested) bug.

I've fixed all that locally. I'll resend the serie tomorrow or the day
after (better wait for comments, I've already bothered the list too
much with resends of the serie, and I'll be offline travelling).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/