Merge branch 'jc/alternate-push'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:39:24 +0000 (09:39 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:39:24 +0000 (09:39 -0700)
* jc/alternate-push:
  push: receiver end advertises refs from alternate repositories
  push: prepare sender to receive extended ref information from the receiver
  receive-pack: make it a builtin
  is_directory(): a generic helper function

1  2 
Makefile
builtin-clone.c
builtin-fetch-pack.c
builtin-send-pack.c
builtin.h
daemon.c
git.c
sha1_file.c

diff --cc Makefile
Simple merge
diff --cc builtin-clone.c
Simple merge
Simple merge
Simple merge
diff --cc builtin.h
Simple merge
diff --cc daemon.c
Simple merge
diff --cc git.c
Simple merge
diff --cc sha1_file.c
Simple merge