Merge branch 'fixes'

diff --cc Documentation/tutorial.txt
index 19da3e2,6ecb089..b9f737e
--- 1/Documentation/tutorial.txt
--- 2/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@@ -1087,9 -1111,11 +1110,11 @@@ i.e. `<project>.git`. Let's create suc
  project `my-git`. After logging into the remote machine, create
  an empty directory:
  
-       mkdir my-git.git
+ ------------
+ mkdir my-git.git
+ ------------
  
 -Then, make that directory into a GIT repository by running
 +Then, make that directory into a git repository by running
  `git init-db`, but this time, since its name is not the usual
  `.git`, we do things slightly differently:
  

diff --cc rsh.c
Simple merge