Some typos fixing.
In basic necessarily changed to neccesarily. In remotes follwed changed to followed. In inspect added ) and divergant changed to divergent.
Rinat Fayzrahmanov committed
Oct 20, 2010 at 23:57 UTC
112e7e060ed301d180d79ba3864f1469bb6f9771
3 files changed
+4
-4
basic/index.html
+1
-1
@@ -106,7 +106,7 @@ layout: reference
106
last added it. This means that if we commit our snapshot right now, we will
107
be recording the version of the file when we last ran <code>git add</code>,
108
not the version that is on our disk. Git does not assume that what the file
109
- looks like on disk is neccesarily what you want to snapshot - you have to
109
+ looks like on disk is necessarily what you want to snapshot - you have to
110
tell Git with the <code>git add</code> command.
111
</p>
112
inspect/index.html
+2
-2
@@ -40,7 +40,7 @@ layout: reference
40
<div class="block">
41
<p>We've already seen how to use <code>git log</code> to compare branches,
42
by looking at the commits on one branch that are not reachable from another.
43
- (If you don't remember, it looks like this: <code>git log branchA ^branchB</code>.
43
+ (If you don't remember, it looks like this: <code>git log branchA ^branchB</code>).
44
However, you can also use <code>git log</code> to look for specific commits.
45
Here we'll be looking at some of the more commonly used <code>git log</code>
46
options, but there are many. Take a look at the official docs for the whole
@@ -368,7 +368,7 @@ index bb86f00..192151c 100644
368
2 files changed, 3 insertions(+), 3 deletions(-)
369
</pre>
370
371
- <p>To compare two divergant branches, however, you can run something like
371
+ <p>To compare two divergent branches, however, you can run something like
372
<code>git diff branchA branchB</code> but the problem is that it will do
373
exactly what you are asking - it will basically give you a patch file that
374
would turn the snapshot at the tip of branchA into the snapshot at the tip
remotes/index.html
+1
-1
@@ -190,7 +190,7 @@ github git@github.com:schacon/hw.git (push)
190
191
<p>The second command that will fetch down new data from a remote server is
192
<code>git pull</code>. This command will basically run a <code>git fetch</code>
193
- immediately follwed by a <code>git merge</code> of the branch on that remote
193
+ immediately followed by a <code>git merge</code> of the branch on that remote
194
that is tracked by whatever branch you are currently in. I personally don't much
195
like this command - I prefer running <code>fetch</code> and <code>merge</code>
196
seperately. Less magic, less problems. However, if you like this idea, you