The unified diff between revisions [41f53cfd..] and [aa5d6bb9..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "distributed-version-control-systems.texinfo"
#  from [c0c43937f06a6dbe286975ecbf8d34fda98315c1]
#    to [5326e8b82ecc4e5dc51e8d1a7246578826b0903c]
#
============================================================
--- distributed-version-control-systems.texinfo	c0c43937f06a6dbe286975ecbf8d34fda98315c1
+++ distributed-version-control-systems.texinfo	5326e8b82ecc4e5dc51e8d1a7246578826b0903c
@@ -862,6 +862,14 @@ possible to "switch" the working copy fr
 from many other repositories.  This is good.  Of course, it is
 possible to "switch" the working copy from a branch to another.

+By default, when you clone a repository you get two branches:
+``origin'' is a mirror of the cloned branch of the upstream
+repository, and ``master'' is the private branch where you commit.
+Thus, Cogito supports my workflow directly by default.  When you push
+the upstream branch, Cogito makes sure that the head of ``master'' is
+a direct descendant of the head of ``origin'', i.e. that no divergence
+has taken place.
+
 Cogito can push and pull over many protocols: local files, HTTP,
 rsync, SSH, etc.)  This is good.

@@ -993,8 +1001,8 @@ the only system that uses that model.
 that doesn't use the commit-before-merge model; currently Monotone is
 the only system that uses that model.

-@multitable {@strong{Version Control System}} {@strong{Size}} {@strong{tags}----------} {@strong{branches}} {@strong{repo}} {@strong{integ}} {@strong{sign}} {@strong{auth}}
-@item @strong{Version Control System} @tab @strong{Size} @tab @strong{tags} @tab @strong{branches} @tab @strong{repo} @tab @strong{integ} @tab @strong{sign} @tab @strong{auth}
+@multitable {@strong{Version Control System}} {@strong{Size}} {@strong{tags}----------} {@strong{branches}} {@strong{checkout}} {@strong{integ}} {@strong{sign}} {@strong{auth}}
+@item @strong{Version Control System} @tab @strong{Size} @tab @strong{tags} @tab @strong{branches} @tab @strong{checkout} @tab @strong{integ} @tab @strong{sign} @tab @strong{auth}
 @item CVS                    @tab 474 @tab expensive    @tab yes  @tab yes @tab no  @tab no  @tab no
 @item Meta-CVS               @tab 474 @tab expensive    @tab yes  @tab yes @tab no  @tab no  @tab no
 @item Bazaar-NG 0.11         @tab   ? @tab no           @tab yes  @tab yes @tab no  @tab yes @tab no
@@ -1013,9 +1021,9 @@ storage.
 @item branches
 Supports multiple branches in a single repository thereby sharing
 storage.
-@item repo
-Supports multiple working copies per repository, thereby sharing
-storage.
+@item checkout
+Supports checking out multiple working copies per repository, thereby
+sharing storage.
 @item integ
 Guarantees data integrity by means of strong hashes, e.g. SHA-1.
 @item sign