fixing typos (possessive case)
Aaron Beckerman committed
Aug 11, 2010 at 02:34 UTC
21288a78480a9e934e78987e900a4dbb78f3b5a4
1 file changed
+1
-1
remotes/index.html
+1
-1
@@ -307,7 +307,7 @@ To git@github.com:schacon/hw.git
307
at the same time, you both do commits, then she pushes and then you try to
308
push, Git will by default not allow you to overwrite her changes. Instead,
309
it basically runs <code>git log</code> on the branch you're trying to push and
310
- makes sure it can see the current tip of the servers branch in your pushes
310
+ makes sure it can see the current tip of the server's branch in your push's
311
history. If it can't see what is on the server in your history, it concludes
312
that you are out of date and will reject your push. You will rightly have to
313
fetch, merge then push again - which makes sure you take her changes into