Merge branch 'master' of git://git.klever.net/patchwork/cgit

* 'master' of git://git.klever.net/patchwork/cgit:
  allow specification of directly linked blobs mimetypes
  allow blob extract blobs by head/path combination

diff --git a/Makefile b/Makefile
index cf32c0aed1151323b4267fe5e60756770da42147..3719e961d73082f02ae23e8c658474fca4be1e36 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.5.5.1
+GIT_VER = 1.5.6
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #

diff --git a/git b/git
index 66aaa2fc22c8494d9019b241f5d6395a6044a895..e449f105805ffa49ccf7cf080db897ecf65a1a0f 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 66aaa2fc22c8494d9019b241f5d6395a6044a895
+Subproject commit e449f105805ffa49ccf7cf080db897ecf65a1a0f