summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
m---------git0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a258f64..6986dc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
CGIT_VERSION = v0.7.2
CGIT_SCRIPT_NAME = cgit.cgi
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.4.rc4
+GIT_VER = 1.5.4.rc5
GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
#
# Let the user override the above settings.
#
-include cgit.conf
diff --git a/git b/git
-Subproject ce33288ea6b81a2f4f5aecd72177bcc8174562a
+Subproject bf5aeb150681ed743d317702eaf123c34b05c31