From 9b58d890df7509942c217df0f9169b3348b399b4 Mon Sep 17 00:00:00 2001 From: Andy Brody Date: Sat, 14 Apr 2012 18:23:13 -1000 Subject: [PATCH] s/seperate/separate/ --- text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown | 2 +- text/15_Interactive_Adding/0_ Interactive_Adding.markdown | 2 +- .../0_Setting_Up_Private_Repo.markdown | 2 +- .../0_ How_Git_Stores_Objects.markdown | 4 ++-- text/52_The_Packfile/0_The_Packfile.markdown | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown index defcc336..e3da42de 100644 --- a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown +++ b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown @@ -106,7 +106,7 @@ that commit: And then when you get to the command line, you revert that commit and create two (or more) new ones. Lets say 21d80a5 modified two files, file1 and file2, -and you wanted to split them into seperate commits. You could do this after +and you wanted to split them into separate commits. You could do this after the rebase dropped you to the command line : $ git reset HEAD^ diff --git a/text/15_Interactive_Adding/0_ Interactive_Adding.markdown b/text/15_Interactive_Adding/0_ Interactive_Adding.markdown index 45e3c270..15f7f93a 100644 --- a/text/15_Interactive_Adding/0_ Interactive_Adding.markdown +++ b/text/15_Interactive_Adding/0_ Interactive_Adding.markdown @@ -82,7 +82,7 @@ If you type '5' or 'p' in the menu, git will show you your diff patch by patch (or hunk by hunk) and ask if you want to stage each one. That way you can actually stage for a commit a part of a file edit. If you've edited a file and want to only commit part of it and not an unfinished part, or commit -documentation or whitespace changes seperate from substantive changes, you can +documentation or whitespace changes separate from substantive changes, you can use 'git add -i' to do so relatively easily. Here I've staged some changes to the book_index_template.html file, but not all diff --git a/text/23A_Setting_Up_Private_Repo/0_Setting_Up_Private_Repo.markdown b/text/23A_Setting_Up_Private_Repo/0_Setting_Up_Private_Repo.markdown index 2eed98b9..5d053ed4 100644 --- a/text/23A_Setting_Up_Private_Repo/0_Setting_Up_Private_Repo.markdown +++ b/text/23A_Setting_Up_Private_Repo/0_Setting_Up_Private_Repo.markdown @@ -24,7 +24,7 @@ however they have ssh authentication setup. ### Multiple User Access using Gitosis ### -If you don't want to setup seperate accounts for every user, you can use +If you don't want to setup separate accounts for every user, you can use a tool called Gitosis. In gitosis, there is an authorized_keys file that contains the public keys of everyone authorized to access the repository, and then everyone uses the 'git' user to do pushes and pulls. diff --git a/text/48_How_Git_Stores_Objects/0_ How_Git_Stores_Objects.markdown b/text/48_How_Git_Stores_Objects/0_ How_Git_Stores_Objects.markdown index f7a03d61..e469dd16 100644 --- a/text/48_How_Git_Stores_Objects/0_ How_Git_Stores_Objects.markdown +++ b/text/48_How_Git_Stores_Objects/0_ How_Git_Stores_Objects.markdown @@ -11,7 +11,7 @@ packed objects. ### Loose Objects ### Loose objects are the simpler format. It is simply the compressed data stored -in a single file on disk. Every object written to a seperate file. +in a single file on disk. Every object written to a separate file. If the sha of your object is ab04d884140f7b0cf8bbf86d6883869f16a46f65, then the file will be stored in the following path: @@ -49,7 +49,7 @@ implementation of object storage: ### Packed Objects ### The other format for object storage is the packfile. Since Git stores each -version of each file as a seperate object, it can get pretty inefficient. +version of each file as a separate object, it can get pretty inefficient. Imagine having a file several thousand lines long and changing a single line. Git will store the second file in it's entirety, which is a great big waste of space. diff --git a/text/52_The_Packfile/0_The_Packfile.markdown b/text/52_The_Packfile/0_The_Packfile.markdown index 2e2b3f50..50786ab6 100644 --- a/text/52_The_Packfile/0_The_Packfile.markdown +++ b/text/52_The_Packfile/0_The_Packfile.markdown @@ -29,7 +29,7 @@ with a given byte can be found to avoid 8 iterations of the binary search). In version 1, the offsets and shas are in the same space, where in version two, -there are seperate tables +there are separate tables for the shas, crc checksums and offsets. At the end of both files are checksum shas for both the index file and the packfile it references.