From b7ce6278ea391972915d9945e90fdc9af82a2629 Mon Sep 17 00:00:00 2001 From: Aaron Beckerman Date: Wed, 11 Aug 2010 02:09:41 +0000 Subject: [PATCH 1/7] fixed typos: syncronize -> synchronize --- remotes/index.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/remotes/index.html b/remotes/index.html index 2720553..394874c 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -15,9 +15,9 @@ layout: reference so far have been done locally, just updating a local database. To collaborate with other developers in Git, you have to put all that data on a server that the other developers have access to. The way Git - does this is to syncronize your data with another repository. There + does this is to synchronize your data with another repository. There is no real difference between a server and a client - a Git repository - is a Git repository and you can syncronize between any two easily. + is a Git repository and you can synchronize between any two easily.

Once you have a Git repository, either one that you set up on your @@ -54,12 +54,12 @@ layout: reference

Unlike centralized version control systems that have a client that is very different from a server, Git repositories are all basically equal and - you simply syncronize between them. This makes it easy to have more than + you simply synchronize between them. This makes it easy to have more than one remote repository - you can have some that you have read-only access to and others that you can write to as well.

So that you don't have to use the full URL of a remote repository every - time you want to syncronize with it, Git stores an alias or nickname for + time you want to synchronize with it, Git stores an alias or nickname for each remote repository URL you are interested in. You use the git remote command to manage this list of remote repos that you care about.

@@ -180,12 +180,12 @@ github git@github.com:schacon/hw.git (push)

Git has two commands to update itself from a remote repository. - git fetch will syncronize you with another repo, pulling down any data + git fetch will synchronize you with another repo, pulling down any data that you do not have locally and giving you bookmarks to where each branch on - that remote was when you syncronized. These are called "remote branches" and are + that remote was when you synchronized. These are called "remote branches" and are identical to local branches except that Git will not allow you to check them out - however, you can merge from them, diff them to other branches, run history logs on - them, etc. You do all of that stuff locally after you syncronize. + them, etc. You do all of that stuff locally after you synchronize.

The second command that will fetch down new data from a remote server is @@ -238,11 +238,11 @@ From github.com:schacon/hw

If you have more than one remote repository, you can either fetch from specific - ones by running git fetch [alias] or you can tell Git to syncronize + ones by running git fetch [alias] or you can tell Git to synchronize with all of your remotes by running git fetch --all.

- In a nutshell you run git fetch [alias] to syncronize your + In a nutshell you run git fetch [alias] to synchronize your repository with a remote repository, fetching all the data it has that you do not into branch references locally for merging and whatnot.

From 06c6fdfbb723d3d3efa8a3837c8db7ffa43b05b2 Mon Sep 17 00:00:00 2001 From: Aaron Beckerman Date: Wed, 11 Aug 2010 02:24:03 +0000 Subject: [PATCH 2/7] removing unnecessary period --- remotes/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remotes/index.html b/remotes/index.html index 394874c..82172a9 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -194,7 +194,7 @@ github git@github.com:schacon/hw.git (push) that is tracked by whatever branch you are currently in. I personally don't much like this command - I prefer running fetch and merge seperately. Less magic, less problems. However, if you like this idea, you - can read about it in more detail in the. + can read about it in more detail in the official docs.

From 600d19ef968f71f1ac20e2dbd9aa77e0c8b3e6f7 Mon Sep 17 00:00:00 2001 From: Aaron Beckerman Date: Wed, 11 Aug 2010 02:29:26 +0000 Subject: [PATCH 3/7] fixing typo: it's -> its --- remotes/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remotes/index.html b/remotes/index.html index 82172a9..2a97e36 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -280,7 +280,7 @@ To git@github.com:schacon/hw.git

Pretty easy. Now if someone clones that repository they will get exactly - what I have committed and all of it's history.

+ what I have committed and all of its history.

What if I have a topic branch like the 'erlang' branch we created earlier and I just want to share that? You can just push that branch instead. From fd1a47085e796612a0d3b9ea11aaec49e39f0858 Mon Sep 17 00:00:00 2001 From: Aaron Beckerman Date: Wed, 11 Aug 2010 02:30:48 +0000 Subject: [PATCH 4/7] fixed typo: a -> an --- remotes/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remotes/index.html b/remotes/index.html index 2a97e36..c5ff095 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -296,7 +296,7 @@ To git@github.com:schacon/hw.git * [new branch] erlang -> erlang -

Now when people clone or fetch from that repository, they'll get a 'erlang' +

Now when people clone or fetch from that repository, they'll get an 'erlang' branch they can look at and merge from. You can push any branch to any remote repository that you have write access to in this way. If your branch is already on the server, it will try to update it, if it is not, Git will From 21288a78480a9e934e78987e900a4dbb78f3b5a4 Mon Sep 17 00:00:00 2001 From: Aaron Beckerman Date: Wed, 11 Aug 2010 02:34:47 +0000 Subject: [PATCH 5/7] fixing typos (possessive case) --- remotes/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remotes/index.html b/remotes/index.html index c5ff095..f23b1c4 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -307,7 +307,7 @@ To git@github.com:schacon/hw.git at the same time, you both do commits, then she pushes and then you try to push, Git will by default not allow you to overwrite her changes. Instead, it basically runs git log on the branch you're trying to push and - makes sure it can see the current tip of the servers branch in your pushes + makes sure it can see the current tip of the server's branch in your push's history. If it can't see what is on the server in your history, it concludes that you are out of date and will reject your push. You will rightly have to fetch, merge then push again - which makes sure you take her changes into From 67e3faf764a09152a83f5ea0f1d11f9b622110b6 Mon Sep 17 00:00:00 2001 From: Aaron Beckerman Date: Wed, 11 Aug 2010 13:45:27 +0000 Subject: [PATCH 6/7] fixed typo: preset -> present --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 18d07b8..03837da 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ layout: reference reference for learning and remembering the most important and commonly used Git commands. The commands are organized into sections of the type of operation you may be trying to do, and - will preset the common options and commands needed to accomplish + will present the common options and commands needed to accomplish these common tasks.

From 58122075f07bf409072af58b72135035f9c79204 Mon Sep 17 00:00:00 2001 From: Aaron Beckerman Date: Wed, 11 Aug 2010 13:47:38 +0000 Subject: [PATCH 7/7] fixed tense --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 03837da..8c8f5ce 100644 --- a/index.html +++ b/index.html @@ -38,7 +38,7 @@ layout: reference

Let's start from scratch. Assume you are designing a new source - code management system. How do you do basic version control before + code management system. How did you do basic version control before you used a tool for it? Chances are that you simply copied your project directory to save what it looked like at that point.