Merge fixes up to GIT 1.0.7

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --cc .gitignore
Simple merge

diff --cc Documentation/git-clone.txt
index f943f26,ffa4fb0..790b87b
--- 1/Documentation/git-clone.txt
--- 2/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@@ -8,7 -8,9 +8,9 @@@ git-clone - Clones a repository
  
  SYNOPSIS
  --------
- 'git-clone' [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>] <repository> [<directory>]
+ [verse]
 -'git-clone' [-l [-s]] [-q] [-n] [-u <upload-pack>]
++'git-clone' [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>]
+         <repository> [<directory>]
  
  DESCRIPTION
  -----------

diff --cc Documentation/git.txt
Simple merge