Permalink
Browse files

Minor edits.

  • Loading branch information...
1 parent 819be96 commit 467145874aee203d50289a4d49c447440416b001 @blynn committed Mar 1, 2010
Showing with 10 additions and 17 deletions.
  1. +5 −8 en/clone.txt
  2. +2 −3 en/intro.txt
  3. +2 −5 en/preface.txt
  4. +1 −1 es/grandmaster.txt
View
@@ -40,7 +40,7 @@ Push your project to the central server with:
$ git push git://central.server/path/to/proj.git HEAD
-We're ready. To check out source, a developer types
+The central server now holds a 'bare repository': a repository with no working directory. In other words, the central server has the history of your project, but never contains a snapshot of it. To check out source, a developer types:
$ git clone git://central.server/path/to/proj.git
@@ -56,14 +56,11 @@ If the main server has been updated, the latest version needs to be checked out
==== Push versus pull ====
-We mostly avoid pushing into a repository, because confusion can ensue
-if the destination has a working directory with changes. However, pushing into
-a bare repository is a straightforward operation and more suitable than a pull
-in this case.
+A push is more convenient than a pull in the above example. If we pulled from the server, we would have to login to the server first, and give the pull command the network address of the machine we're pulling from. Firewalls may interfere, and we might not even have shell access to the server.
-Pulling from the server requires shelling into the server, and also
-knowing the network address of the machine you happen to be working on.
-Furthermore, firewalls may interfere.
+However, we usually avoid pushing into a repository, because confusion can ensue if the destination has a working directory with changes. But since a bare repository by definition has no working directory, pushing to a bare repository is a straightforward operation.
+
+In short, while learning Git, only push when the target is a bare repository; otherwise pull.
=== Forking a Project ===
View
@@ -43,9 +43,8 @@ A popular misconception is that distributed systems are ill-suited for projects
A good first approximation is that anything a centralized version control system can do, a well-designed distributed system can do better. Network resources are simply costlier than local resources. While we shall later see there are drawbacks to a distributed approach, one is less likely to make erroneous comparisons with this rule of thumb.
A small project may only need a fraction of the features offered by such a
-system, but saying you should use systems that don't scale well when your
-project is tiny is like saying you should use Roman numerals for calculations
-involving small numbers.
+system, but using systems that scale poorly for tiny projects is like using
+Roman numerals for calculations involving small numbers.
Moreover, your project may grow beyond your original expectations. Using Git from the outset is like carrying a Swiss army knife even though you mostly use it to open bottles. On the day you desperately need a screwdriver you'll be glad you have more than a plain bottle-opener.
View
@@ -24,12 +24,9 @@ Rather than go into details, we provide rough instructions for particular effect
=== Thanks! ===
-Dustin Sallings, Alberto Bertogli, James Cameron, Douglas Livingstone,
-Michael Budde, Richard Albury, Tarmigan, Derek Mahar, Frode Aannevik, Keith
-Rarick, Andy Somerville, Ralf Recker, Øyvind A. Holm, Miklos Vajna,
-Sébastien Hinderer, and Thomas Miedema contributed corrections and improvements.
+Dustin Sallings, Alberto Bertogli, James Cameron, Douglas Livingstone, Michael Budde, Richard Albury, Tarmigan, Derek Mahar, Frode Aannevik, Keith Rarick, Andy Somerville, Ralf Recker, Øyvind A. Holm, Miklos Vajna, Sébastien Hinderer, Thomas Miedema, and Joe Malin contributed corrections and improvements.
-Francois Marier maintains the Debian package originally created by Daniel
+François Marier maintains the Debian package originally created by Daniel
Baumann.
JunJie, Meng, JiangWei, Rodrigo Toledo, and Leonardo Siqueira Rodrigues
View
@@ -1,4 +1,4 @@
-== Gran Maestría en Git==
+== Gran Maestría en Git ==
Esta página con nombre pretencioso es el cajón donde dejar los trucos de Git no categorizados.

0 comments on commit 4671458

Please sign in to comment.