Merge branch 'js/ref-namespaces'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:35:38 +0000 (17:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:35:38 +0000 (17:35 -0700)
* js/ref-namespaces:
  ref namespaces: tests
  ref namespaces: documentation
  ref namespaces: Support remote repositories via upload-pack and receive-pack
  ref namespaces: infrastructure
  Fix prefix handling in ref iteration functions

1  2 
Documentation/Makefile
Documentation/git-receive-pack.txt
Documentation/git-upload-pack.txt
Documentation/git.txt
builtin/receive-pack.c
cache.h
contrib/completion/git-completion.bash
environment.c
git.c
refs.c
refs.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc environment.c
Simple merge
diff --cc git.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs.h
Simple merge