Merge fixes up to GIT 1.0.7

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

diff --combined .gitignore
index 47d76f407e35326824360fffde440e4b4bb0ac7b,dbbef06c0a3e521f24c3a67240389ed0b4a5f572..1a9090bffc095abef71bf7a4121d69bfa4372174
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +GIT-VERSION-FILE
  git
  git-add
  git-am
@@@ -120,3 -119,4 +120,4 @@@ git-core.spe
  *.exe
  libgit.a
  *.o
+ *.py[co]

diff --combined Documentation/git-clone.txt
index f943f267da0356d6e129f10117fce16e19aba939,ffa4fb0a03b54526743178e71b9956e50c8d298d..790b87b231d46d6e9de9d85024b25b49ee225488
--- 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
  -----------
@@@ -56,13 -58,6 +58,13 @@@ OPTION
  -n::
        No checkout of HEAD is performed after the clone is complete.
  
 +-o <name>::
 +      Instead of using the branch name 'origin' to keep track
 +      of the upstream repository, use <name> instead.  Note
 +      that the shorthand name stored in `remotes/origin` is
 +      not affected, but the local branch name to pull the
 +      remote `master` branch into is.
 +
  --upload-pack <upload-pack>::
  -u <upload-pack>::
        When given, and the repository to clone from is handled

diff --combined Documentation/git.txt
index 90c5bfaf64b4b27ac46a2a0156fee21312f80a7b,875d4877667d8d7cc92eca7af319a29e029221d1..92cfe0ee31a3ce6fc85ac4041ae9bb17e6419a8d
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -139,9 -139,6 +139,9 @@@ Interrogation command
  gitlink:git-cat-file[1]::
        Provide content or type/size information for repository objects.
  
 +gitlink:git-describe[1]::
 +      Show the most recent tag that is reachable from a commit.
 +
  gitlink:git-diff-index[1]::
        Compares content and mode of blobs between the index and repository.
  
@@@ -425,7 -422,7 +425,7 @@@ gitlink:git-rev-parse[1]:
  gitlink:git-send-email[1]::
        Send patch e-mails out of "format-patch --mbox" output.
  
- gitlink:git-symbolic-refs[1]::
+ gitlink:git-symbolic-ref[1]::
        Read and modify symbolic refs.
  
  gitlink:git-stripspace[1]::