git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: gpermus@gmail.com, hanwen@lilypond.org, git@vger.kernel.org
Subject: Re: [PATCH] cvs-migration document: make the need for "push" more obvious
Date: Wed, 06 Dec 2006 15:52:26 +0100	[thread overview]
Message-ID: <4576D92A.80307@xs4all.nl> (raw)
In-Reply-To: <Pine.LNX.4.63.0612061325320.28348@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin escreveu:
> It really is an important concept to grasp for people coming
> from CVS. Even if it is briefly mentioned, it is not obvious
> enough to sink in.

I think the goal is laudable, but IMO it would be better to shorten
the document rather adding more text.

here is my try
 
From 980a0ca1b274e1219c24c3138f95e42206c72875 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@lilypond.org>
Date: Wed, 6 Dec 2006 15:50:13 +0100
Subject: [PATCH] another try at  rephrasing cvs doc.


Signed-off-by: Han-Wen Nienhuys <hanwen@xs4all.nl>
---
 Documentation/cvs-migration.txt |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index 6812683..3270c57 100644
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -6,24 +6,36 @@ this document is to put you on the road to recovery, by helping you
 convert an existing cvs repository to git, and by showing you how to use a
 git repository in a cvs-like fashion.
 
-Some basic familiarity with git is required.  This
-link:tutorial.html[tutorial introduction to git] should be sufficient.
-
-First, note some ways that git differs from CVS:
+Git differs from CVS:
 
   * Commits are atomic and project-wide, not per-file as in CVS.
 
-  * Offline work is supported: you can make multiple commits locally,
+  * Branching is fast and easy.
+
+  * GIT is a distributed version control system:
+    This has several consequences:
+
+    - Every working tree contains a repository with a full copy of the
+    project history.
+    
+    - Offline work is supported: you can create revisions locally,
     then submit them when you're ready.
 
-  * Branching is fast and easy.
+    Hence, there is a difference between creating a revision
+    (the "commit" command) and submitting it (the "push" command).
+
+    - No repository is inherently more important than
+    any other.
+    
+    Of course, a project may still designate one central repository as
+    the True Master that contributors synchronize with.
+
+    See below for details.
 
-  * Every working tree contains a repository with a full copy of the
-    project history, and no repository is inherently more important than
-    any other.  However, you can emulate the CVS model by designating a
-    single shared repository which people can synchronize with; see below
-    for details.
+Some basic familiarity with git is required.  This
+link:tutorial.html[tutorial introduction to git] should be sufficient.
 
+    
 Importing a CVS archive
 -----------------------
 
-- 
1.4.4.1.gc9922-dirty


-- 

  parent reply	other threads:[~2006-12-06 14:52 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <4574AC9E.3040506@gmail.com>
     [not found] ` <4574BF70.8070100@lilypond.org>
2006-12-06  0:41   ` git newbie problems Graham Percival
2006-12-06  1:23     ` Jakub Narebski
2006-12-06  9:39       ` Han-Wen Nienhuys
2006-12-06 10:17         ` Jakub Narebski
2006-12-06 10:21           ` Han-Wen Nienhuys
2006-12-06 10:42             ` Johannes Schindelin
2006-12-06  1:35     ` Junio C Hamano
2006-12-06 22:19       ` Daniel Barkalow
2006-12-06  1:52     ` Tom Prince
     [not found]     ` <el5608$952$2@sea.gmane.org>
2006-12-06  8:01       ` Graham Percival
     [not found]   ` <45760545.2010801@gmail.com>
     [not found]     ` <Pine.LNX.4.63.0612060053400.28348@wbgn013.biozentrum.uni-wuerzburg.de>
     [not found]       ` <45761451.8020006@gmail.com>
     [not found]         ` <Pine.LNX.4.63.0612060157020.28348@wbgn013.biozentrum.uni-wuerzburg.de>
2006-12-06  9:55           ` git patch Han-Wen Nienhuys
2006-12-06 10:00             ` Junio C Hamano
2006-12-06 10:22             ` Jakub Narebski
     [not found]             ` <Pine.LNX.4.63.0612061105220.28348@wbgn013.biozentrum.uni-wuerzburg.de>
     [not found]               ` <457698E0.80207@lilypond.org>
     [not found]                 ` <Pine.LNX.4.63.0612061147540.28348@wbgn013.biozentrum.uni-wuerzburg.de>
2006-12-06 11:27                   ` Han-Wen Nienhuys
     [not found]     ` <20061206.105251.144349770.wl@gnu.org>
2006-12-06 12:27       ` [PATCH] cvs-migration document: make the need for "push" more obvious Johannes Schindelin
2006-12-06 12:32         ` Jakub Narebski
2006-12-06 13:14           ` Johannes Schindelin
2006-12-06 13:27             ` Jakub Narebski
2006-12-06 13:32               ` New users, was " Johannes Schindelin
2006-12-06 14:52           ` J. Bruce Fields
2006-12-06 14:52         ` Han-Wen Nienhuys [this message]
2006-12-06 14:58           ` J. Bruce Fields
2006-12-06 15:05             ` Han-Wen Nienhuys
2006-12-06 15:16             ` Johannes Schindelin
2006-12-06 17:19               ` J. Bruce Fields
2006-12-06 17:24                 ` J. Bruce Fields
2006-12-06 17:44                   ` Junio C Hamano
2006-12-07  4:18                     ` [PATCH] Documentation: reorganize cvs-migration.txt J. Bruce Fields
2006-12-07  5:51                       ` Junio C Hamano
2006-12-07 15:21                         ` J. Bruce Fields
2006-12-07 14:28                       ` Johannes Schindelin
2006-12-07 17:43                         ` J. Bruce Fields
2006-12-07 17:50                           ` Johannes Schindelin
2006-12-08  3:34                             ` J. Bruce Fields
2006-12-08  7:25                               ` Junio C Hamano
2006-12-09  3:58                                 ` J. Bruce Fields
2006-12-06 21:02                   ` [PATCH] cvs-migration document: make the need for "push" more obvious Graham Percival
2006-12-06 21:45                     ` J. Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4576D92A.80307@xs4all.nl \
    --to=hanwen@xs4all.nl \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gpermus@gmail.com \
    --cc=hanwen@lilypond.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).