From: Junio C Hamano <junkio@cox.net>
Date: Fri, 6 Jan 2006 04:54:42 +0000 (-0800)
Subject: Merge fixes up to GIT 1.0.7
X-Git-Tag: v1.1.0~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5df466c507ee2dd81c2e9002c3fedf3536cde0dc?ds=inline;hp=-c

Merge fixes up to GIT 1.0.7

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

5df466c507ee2dd81c2e9002c3fedf3536cde0dc
diff --combined .gitignore
index 47d76f407e,dbbef06c0a..1a9090bffc
--- a/.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 f943f267da,ffa4fb0a03..790b87b231
--- a/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 90c5bfaf64,875d487766..92cfe0ee31
--- a/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]::