Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

sp

  • Loading branch information...
commit 7a5c4abe2da04ed7d8b5532ed50195e993eccfa7 1 parent eb3b916
@schacon schacon authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  _posts/tips/2011-07-11-reset.html
View
2  _posts/tips/2011-07-11-reset.html
@@ -395,7 +395,7 @@ <h3 class="subtitle">
<p>First, unlike <code>reset --hard</code>, <code>checkout</code> is working
directory safe in this invocation. It will check to make sure it's not blowing
-away files that have changes to them. Actually, this is a subtle differnce,
+away files that have changes to them. Actually, this is a subtle difference,
because it will update all of the working directory except the files you've
modified if it can - it will do a trivial merge between what you're checking
out and what's already there. In this case, <code>reset --hard</code> will
Please sign in to comment.
Something went wrong with that request. Please try again.