From 112e7e060ed301d180d79ba3864f1469bb6f9771 Mon Sep 17 00:00:00 2001 From: Rinat Fayzrahmanov Date: Wed, 20 Oct 2010 23:57:12 +0400 Subject: [PATCH] Some typos fixing. In basic necessarily changed to neccesarily. In remotes follwed changed to followed. In inspect added ) and divergant changed to divergent. --- basic/index.html | 2 +- inspect/index.html | 4 ++-- remotes/index.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/basic/index.html b/basic/index.html index c1e88c4..b7f2304 100644 --- a/basic/index.html +++ b/basic/index.html @@ -106,7 +106,7 @@ layout: reference 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 git add, 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 git add command.

diff --git a/inspect/index.html b/inspect/index.html index 6adcee4..c8b3f48 100644 --- a/inspect/index.html +++ b/inspect/index.html @@ -40,7 +40,7 @@ layout: reference

We've already seen how to use git log 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: git log branchA ^branchB. + (If you don't remember, it looks like this: git log branchA ^branchB). However, you can also use git log to look for specific commits. Here we'll be looking at some of the more commonly used git log options, but there are many. Take a look at the official docs for the whole @@ -368,7 +368,7 @@ index bb86f00..192151c 100644 2 files changed, 3 insertions(+), 3 deletions(-) -

To compare two divergant branches, however, you can run something like +

To compare two divergent branches, however, you can run something like git diff branchA branchB 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 diff --git a/remotes/index.html b/remotes/index.html index f23b1c4..df16b27 100644 --- a/remotes/index.html +++ b/remotes/index.html @@ -190,7 +190,7 @@ github git@github.com:schacon/hw.git (push)

The second command that will fetch down new data from a remote server is git pull. This command will basically run a git fetch - immediately follwed by a git merge of the branch on that remote + immediately followed by a git merge 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 fetch and merge seperately. Less magic, less problems. However, if you like this idea, you