From fdc2cc52b411312d31338497e0b5b29e97881944 Mon Sep 17 00:00:00 2001
From: Michael Lehenbauer <mikelehen@gmail.com>
Date: Sun, 3 Apr 2011 16:17:00 -0700
Subject: [PATCH 1/2] Add note that ^ is a special character in windows.

---
 branching/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/branching/index.html b/branching/index.html
index 21ca658..7d01b4d 100644
--- a/branching/index.html
+++ b/branching/index.html
@@ -665,6 +665,9 @@ b7ae93b added from ruby
       front of the branch that we don't want to see.  For instance, if we want
       to see the commits that are in the 'erlang' branch that are not in the
       'master' branch, we can do <code>erlang ^master</code>, or vice versa.
+      Note that the Windows command-line treats <code>^</code> as a special
+      character, in which case you'll need to surround <code>^master</code>
+      in quotes.
     </p>
 
 <pre>

From 39dbc55a493b46f3a9631af99ff84ff54cd9f119 Mon Sep 17 00:00:00 2001
From: Michael Lehenbauer <mikelehen@gmail.com>
Date: Sun, 3 Apr 2011 16:25:13 -0700
Subject: [PATCH 2/2] Fix "elses" to "else's"

---
 remotes/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remotes/index.html b/remotes/index.html
index df16b27..1b5b371 100644
--- a/remotes/index.html
+++ b/remotes/index.html
@@ -94,7 +94,7 @@ origin	git@github.com:schacon/git-reference.git (push)
     </h4>
 
     <p>If you want to share a locally created repository, or you want to take
-    contributions from someone elses repository - if you want to interact in
+    contributions from someone else's repository - if you want to interact in
     any way with a new repository, it's generally easiest to add it as a remote.
     You do that by running <code>git remote add [alias] [url]</code>.  That
     adds <code>[url]</code> under a local remote named <code>[alias]</code>.</p>