--- a/oi-extras/git/Makefile	Thu Aug 11 13:29:05 2011 +0100
+++ b/oi-extras/git/Makefile	Sun Aug 14 18:00:25 2011 +0100
@@ -23,17 +23,17 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		git
-COMPONENT_VERSION=	1.7.5.4
-PERL_VERSION=		5.10.0
+COMPONENT_VERSION=	1.7.6
+PERL_VERSION=		5.12
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
-COMPONENT_ARCHIVE_HASH=	sha1:076eca037a993de2c1bcf093fee5a1ad56af71fa
+COMPONENT_ARCHIVE_HASH=	sha1:c519b0765c419c84b561bb4a2a86526b16d95cde
 COMPONENT_ARCHIVE_URL=	http://kernel.org/pub/software/scm/git/$(COMPONENT_ARCHIVE)
 #
 # man pages are a separate archive
 #
 COMPONENT_ARCHIVE_1 =	$(COMPONENT_NAME)-manpages-$(COMPONENT_VERSION).tar.bz2
-COMPONENT_ARCHIVE_HASH_1 = sha1:f7ca383d94152777eca28fdffce38d88a51b90cf
+COMPONENT_ARCHIVE_HASH_1 = sha1:45e0759597d649b13f684f55a186d46dafb7d414
 COMPONENT_ARCHIVE_URL_1 = http://kernel.org/pub/software/scm/git/$(COMPONENT_ARCHIVE_1)
 
 include ../../make-rules/prep.mk

--- a/oi-extras/git/git.p5m	Thu Aug 11 13:29:05 2011 +0100
+++ b/oi-extras/git/git.p5m	Sun Aug 14 18:00:25 2011 +0100
@@ -99,13 +99,17 @@
 file path=usr/lib/git-core/git-pull
 file path=usr/lib/git-core/git-quiltimport
 file path=usr/lib/git-core/git-rebase
+file path=usr/lib/git-core/git-rebase--am
 file path=usr/lib/git-core/git-rebase--interactive
+file path=usr/lib/git-core/git-rebase--merge
 file path=usr/lib/git-core/git-relink
 file path=usr/lib/git-core/git-remote-http
 file path=usr/lib/git-core/git-remote-testgit
 file path=usr/lib/git-core/git-repack
 file path=usr/lib/git-core/git-request-pull
 file path=usr/lib/git-core/git-send-email
+file path=usr/lib/git-core/git-sh-i18n
+file path=usr/lib/git-core/git-sh-i18n--envsubst
 file path=usr/lib/git-core/git-sh-setup
 file path=usr/lib/git-core/git-show-index
 file path=usr/lib/git-core/git-stash