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 --combined .gitignore
index 18a7295e6ca864e416a02dc12d7dff4cd9b9748d,ec4c0dc3df92ff8119295b055c63311e4b50f5aa..afd0876218686c14834ff27b3ad6f0da307da601
@@@ -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