From: Junio C Hamano <junkio@cox.net>
Date: Thu, 25 May 2006 05:32:38 +0000 (-0700)
Subject: Merge branch 'jc/fetchupload' into next
X-Git-Tag: v1.4.1-rc1~61
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/84138845c56306d1c455b89a6be7fbdc4f2ead04?hp=-c

Merge branch 'jc/fetchupload' into next

* jc/fetchupload:
fetch-pack: give up after getting too many "ack continue"
cat-file: document -p option
Built git-upload-tar should be ignored.
ls-remote: fix rsync:// to report HEAD
---

84138845c56306d1c455b89a6be7fbdc4f2ead04
diff --combined .gitignore
index 18a7295e6c,ec4c0dc3df..afd0876218
--- a/.gitignore
+++ b/.gitignore
@@@ -116,6 -116,7 +116,7 @@@ git-update-inde
  git-update-ref
  git-update-server-info
  git-upload-pack
+ git-upload-tar
  git-var
  git-verify-pack
  git-verify-tag
@@@ -124,7 -125,6 +125,7 @@@ git-write-tre
  git-core-*/?*
  test-date
  test-delta
 +test-dump-cache-tree
  common-cmds.h
  *.tar.gz
  *.dsc