Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2013 23:15:00 +0000 (16:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2013 23:15:00 +0000 (16:15 -0700)
* maint:
git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORY
clone --branch: refuse to clone if upstream repo is empty

1  2 
builtin/clone.c
diff --cc builtin/clone.c
Simple merge