diff --git a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown index defcc336..bf2d077e 100644 --- a/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown +++ b/text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown @@ -1,7 +1,7 @@ ## Interactive Rebasing ## You can also rebase interactively. This is often used to re-write your -own commit objects before pusing them somewhere. It is an easy way to +own commit objects before pushing them somewhere. It is an easy way to split, merge or re-order commits before sharing them with others. You can also use it to clean up commits you've pulled from someone when applying them locally. @@ -17,7 +17,7 @@ since the last time you have pushed (or merged from the origin repository). To see what commits those are beforehand, you can run log this way: - $ git log github/master.. + $ git log origin/master.. Once you run the 'rebase -i' command, you will be thrown into your editor of choice with something that looks like this: @@ -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^ @@ -120,4 +120,4 @@ And now instead of 5 commits, you would have 6. The last useful thing that interactive rebase can do is drop commits for you. If instead of choosing 'pick', 'squash' or 'edit' for the commit line, you -simply remove the line, it will remove the commit from the history. \ No newline at end of file +simply remove the line, it will remove the commit from the history. 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..da203c3c 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,9 +24,9 @@ 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. -[Installing and Setting up Gitosis](http://www.urbanpuddle.com/articles/2008/07/11/installing-git-on-a-server-ubuntu-or-debian) \ No newline at end of file +[Installing and Setting up Gitosis](http://www.urbanpuddle.com/articles/2008/07/11/installing-git-on-a-server-ubuntu-or-debian) diff --git a/text/52_The_Packfile/0_The_Packfile.markdown b/text/52_The_Packfile/0_The_Packfile.markdown index 2e2b3f50..a526c087 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. @@ -100,4 +100,4 @@ adhere to are: packfile; * the base object must be of the same underlying type (blob, tree, commit - or tag); \ No newline at end of file + or tag);