Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Typo fixes #49

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions text/14_Interactive_Rebasing/0_ Interactive_Rebasing.markdown
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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:
Expand Down 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 All @@ -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.
simply remove the line, it will remove the commit from the history.
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,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)
[Installing and Setting up Gitosis](http://www.urbanpuddle.com/articles/2008/07/11/installing-git-on-a-server-ubuntu-or-debian)
4 changes: 2 additions & 2 deletions 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 Expand Up @@ -100,4 +100,4 @@ adhere to are:
packfile;

* the base object must be of the same underlying type (blob, tree, commit
or tag);
or tag);