Skip to content

Commit

Permalink
s/seperate/separate/
Browse files Browse the repository at this point in the history
  • Loading branch information
ab committed Apr 15, 2012
1 parent 86d1d30 commit 9b58d89
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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^
Expand Down
2 changes: 1 addition & 1 deletion text/15_Interactive_Adding/0_ Interactive_Adding.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ however they have ssh authentication setup.

This comment has been minimized.

Copy link
@vargas06
### 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <code>ab04d884140f7b0cf8bbf86d6883869f16a46f65</code>,
then the file will be stored in the following path:
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion text/52_The_Packfile/0_The_Packfile.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 9b58d89

Please sign in to comment.