From f15faf9b4aa454e9e84afa2b6c252fea4b728c2e Mon Sep 17 00:00:00 2001 From: nvl Date: Fri, 24 Sep 2010 13:52:04 +0530 Subject: [PATCH 1/4] fixed typo: recusively to recursively --- basic/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/index.html b/basic/index.html index 82d9772..a932f82 100644 --- a/basic/index.html +++ b/basic/index.html @@ -83,7 +83,7 @@ layout: reference

- It is also common to recusively add all files in a new project by specifying + It is also common to recursively add all files in a new project by specifying the current working directory like this: git add .. Since Git will recursively add all files under a directory you give it, if you give it the current working directory, it will simply start tracking every file From 2ecd968a884ea2b9aeda811f070f471e535a6f41 Mon Sep 17 00:00:00 2001 From: nvl Date: Fri, 24 Sep 2010 14:08:55 +0530 Subject: [PATCH 2/4] fixed typo: syncronize/d to synchronize/d --- 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 cdeb11fcc971acda397392ab7fe67b2555892391 Mon Sep 17 00:00:00 2001 From: nvl Date: Sat, 25 Sep 2010 00:48:08 +0530 Subject: [PATCH 3/4] ignore temp vi files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ca35be0..a16c005 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ _site +*~ From ed7cef1dfcbba035d6cb5809086a483f647c2382 Mon Sep 17 00:00:00 2001 From: nvl Date: Sun, 26 Sep 2010 10:47:21 +0530 Subject: [PATCH 4/4] change the 'src' attribute of pointing to snapshots.png changed the src from '/images/snapshots.png' to './images/snapshots.png' Earlier, it didnt load the image when trying to open it in browser directly from the repo. Also, "http://jointheconversation.org/git-reference/" does not load the image, but when the src is changed, the image loads fine. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 18d07b8..dd98783 100644 --- a/index.html +++ b/index.html @@ -98,7 +98,7 @@ layout: reference how they differ or pull content out of them, etc.

-
+

If you think about Git