Skip to content

Some typos fixing. #18

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

Merged
1 commit merged into from
Dec 29, 2010
Merged
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
2 changes: 1 addition & 1 deletion basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h2>
last added it. This means that if we commit our snapshot right now, we will
be recording the version of the file when we last ran <code>git add</code>,
not the version that is on our disk. Git does not assume that what the file
looks like on disk is neccesarily what you want to snapshot - you have to
looks like on disk is necessarily what you want to snapshot - you have to
tell Git with the <code>git add</code> command.
</p>

Expand Down
4 changes: 2 additions & 2 deletions inspect/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>
<div class="block">
<p>We've already seen how to use <code>git log</code> to compare branches,
by looking at the commits on one branch that are not reachable from another.
(If you don't remember, it looks like this: <code>git log branchA ^branchB</code>.
(If you don't remember, it looks like this: <code>git log branchA ^branchB</code>).
However, you can also use <code>git log</code> to look for specific commits.
Here we'll be looking at some of the more commonly used <code>git log</code>
options, but there are many. Take a look at the official docs for the whole
Expand Down Expand Up @@ -368,7 +368,7 @@ <h2>
2 files changed, 3 insertions(+), 3 deletions(-)
</pre>

<p>To compare two divergant branches, however, you can run something like
<p>To compare two divergent branches, however, you can run something like
<code>git diff branchA branchB</code> but the problem is that it will do
exactly what you are asking - it will basically give you a patch file that
would turn the snapshot at the tip of branchA into the snapshot at the tip
Expand Down
2 changes: 1 addition & 1 deletion remotes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ <h2>

<p>The second command that will fetch down new data from a remote server is
<code>git pull</code>. This command will basically run a <code>git fetch</code>
immediately follwed by a <code>git merge</code> of the branch on that remote
immediately followed by a <code>git merge</code> of the branch on that remote
that is tracked by whatever branch you are currently in. I personally don't much
like this command - I prefer running <code>fetch</code> and <code>merge</code>
seperately. Less magic, less problems. However, if you like this idea, you
Expand Down