4 files changed, 138 insertions, 132 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 4a633894c514..9bfbc5aec542 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.7.2.3
+PORTVERSION=	1.7.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_KERNEL_ORG}
 MASTER_SITE_SUBDIR=	software/scm/${PORTNAME}
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 62054f3b889b..23d32879f6db 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,18 +1,18 @@
-MD5 (git-1.7.2.3.tar.bz2) = d88c06f6442156686deb4b4fbab0954c
-SHA256 (git-1.7.2.3.tar.bz2) = 6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1
-SIZE (git-1.7.2.3.tar.bz2) = 2567979
-MD5 (git-manpages-1.7.2.3.tar.bz2) = 2ef8d3959c832347c29885627ebc0682
-SHA256 (git-manpages-1.7.2.3.tar.bz2) = 87e00245e10472ee5acdd75bb5a6e2e89c12638b498e0df9edca6201439d47d7
-SIZE (git-manpages-1.7.2.3.tar.bz2) = 288264
-MD5 (git-htmldocs-1.7.2.3.tar.bz2) = e8505ed81506ee4ad6e15d149f366866
-SHA256 (git-htmldocs-1.7.2.3.tar.bz2) = ee460ef1e58d103fe3af3812adab628d7fc8fa91c1a3128bc8bf0b334126832f
-SIZE (git-htmldocs-1.7.2.3.tar.bz2) = 899056
-MD5 (git-1.7.2.3.tar.bz2.sign) = 5cd255aaaa0c7942a5c6d4edab0d93c6
-SHA256 (git-1.7.2.3.tar.bz2.sign) = e66347598876aabffb8fb50c9f9d6fa22480cda42031b18f0a8022488a14489a
-SIZE (git-1.7.2.3.tar.bz2.sign) = 248
-MD5 (git-manpages-1.7.2.3.tar.bz2.sign) = 3e658505ade14054ce1e41a627ae7917
-SHA256 (git-manpages-1.7.2.3.tar.bz2.sign) = 3a41d230df853bf4f8769fd4254bda4aef46ab1cb94bc9b583c047d9b40aaf54
-SIZE (git-manpages-1.7.2.3.tar.bz2.sign) = 248
-MD5 (git-htmldocs-1.7.2.3.tar.bz2.sign) = b1cdde115a4e350e5ecb2be6f898bb4a
-SHA256 (git-htmldocs-1.7.2.3.tar.bz2.sign) = e1bed0d2df3434f1995afcbdac4930f3d047555204f8e65c74989008fa015fa7
-SIZE (git-htmldocs-1.7.2.3.tar.bz2.sign) = 248
+MD5 (git-1.7.3.tar.bz2) = c18eb252ce63a688071f10c3f7bc28e1
+SHA256 (git-1.7.3.tar.bz2) = 0035a4a7906f65812072457b65c609f24c66f31593d0ad372b7c18894a26b07d
+SIZE (git-1.7.3.tar.bz2) = 2629734
+MD5 (git-manpages-1.7.3.tar.bz2) = d18d8f686fde24d1262ccbe61ad00ae0
+SHA256 (git-manpages-1.7.3.tar.bz2) = e661a5f27599e59c91fd5e4049cc0145871cc47802686172d03c3b732f6fded2
+SIZE (git-manpages-1.7.3.tar.bz2) = 290494
+MD5 (git-htmldocs-1.7.3.tar.bz2) = 0a90e969db9a4e6b73b395cf19255b0b
+SHA256 (git-htmldocs-1.7.3.tar.bz2) = 3837b1b11ca95968ca286ff8819ebdcb0cb6b59240712cfaa0b9c8b9489ca8ed
+SIZE (git-htmldocs-1.7.3.tar.bz2) = 908959
+MD5 (git-1.7.3.tar.bz2.sign) = 5ecc948cc1a64dcb48d6a91f8080ab21
+SHA256 (git-1.7.3.tar.bz2.sign) = e4b686255af4958dbc5f3a4f7573ce0e05c86272f816ef6bba83f584eb6c2507
+SIZE (git-1.7.3.tar.bz2.sign) = 248
+MD5 (git-manpages-1.7.3.tar.bz2.sign) = 37bfd81efee1a9f8f2fd88ca7b9fef2a
+SHA256 (git-manpages-1.7.3.tar.bz2.sign) = 980dc90d35ad3231508c1bc37fee24cdb637d1ca248983d8733fa4eaba4b9a9b
+SIZE (git-manpages-1.7.3.tar.bz2.sign) = 248
+MD5 (git-htmldocs-1.7.3.tar.bz2.sign) = 3240ad276a0f82177b82863639772756
+SHA256 (git-htmldocs-1.7.3.tar.bz2.sign) = 9cdc2c0fabf9597bb539fd77220b0c3faf03a6f965748da4348ee0368b824656
+SIZE (git-htmldocs-1.7.3.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile
index d921a72716a7..6cf158d33aaf 100644
--- a/devel/git/files/patch-Makefile
+++ b/devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- ./Makefile.orig	2010-07-28 13:03:43.000000000 -0400
-+++ ./Makefile	2010-08-16 21:56:54.957322822 -0400
-@@ -255,8 +255,8 @@
+--- Makefile.orig	2010-09-18 19:43:54.000000000 -0400
++++ Makefile	2010-09-26 16:22:51.939180025 -0400
+@@ -257,8 +257,8 @@
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@ -11,7 +11,7 @@
  ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -276,13 +276,13 @@
+@@ -278,13 +278,13 @@
  prefix = $(HOME)
  bindir_relative = bin
  bindir = $(prefix)/$(bindir_relative)
@@ -29,7 +29,7 @@
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
-@@ -296,18 +296,18 @@
+@@ -298,19 +298,19 @@
  
  export prefix bindir sharedir sysconfdir gitwebdir
  
@@ -45,6 +45,7 @@
 -TCLTK_PATH = wish
 -PTHREAD_LIBS = -lpthread
 -PTHREAD_CFLAGS =
+-GCOV = gcov
 +CC ?= gcc
 +AR ?= ar
 +RM ?= rm -f
@@ -57,10 +58,11 @@
 +TCLTK_PATH ?= wish
 +PTHREAD_LIBS ?= -lpthread
 +PTHREAD_CFLAGS ?=
++GCOV ?= gcov
  
  export TCL_PATH TCLTK_PATH
  
-@@ -1232,9 +1232,9 @@
+@@ -1245,9 +1245,9 @@
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index c666a0039177..ef14ee3c8f03 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -492,6 +492,8 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitworkflows.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-merge.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html
 %%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.txt
@@ -671,113 +673,114 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/gitdiffcore.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.html
 %%HTMLDOCS%%%%DOCSDIR%%/gitrevisions.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.7.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.7.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.8.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.7.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.1.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.2.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.3.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.4.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.4.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.4.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.4.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.7.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.5.8.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.3.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.4.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.5.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.6.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.7.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.2.1.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.2.2.txt
-%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.2.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.0.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.1.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.1.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.1.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.1.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.1.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.1.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.2.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.2.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.2.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.3.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.4.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.5.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.6.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.6.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.6.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.6.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.5.6.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.0.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.0.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.0.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.0.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.0.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.1.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.1.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.1.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.1.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.2.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.2.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.2.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.3.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.3.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.3.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.3.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.4.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.4.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.4.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.4.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.5.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.6.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.6.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.0.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.1.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.1.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.2.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.3.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
@@ -876,6 +879,7 @@ share/git-core/templates/info/exclude
 %%GUI%%@dirrm share/git-gui/lib
 %%GUI%%@dirrm share/git-gui
 %%HTMLDOCS%%@dirrm %%DOCSDIR%%/technical
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%/RelNotes
 %%HTMLDOCS%%@dirrm %%DOCSDIR%%/howto
 %%HTMLDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/git-core