Merge branch 'jc/fetchupload' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 25 May 2006 05:32:38 +0000 (22:32 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 25 May 2006 05:32:38 +0000 (22:32 -0700)
* 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

1  2 
.gitignore

diff --cc .gitignore
Simple merge