1 files changed, 300 insertions, 6 deletions

diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 2ddc1bb8280b..6f6968d684bf 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -1,6 +1,6 @@
 bin/git
-bin/git-p4
-bin/git-p4import
+%%P4%%bin/git-p4
+%%P4%%bin/git-p4import
 bin/git-upload-pack
 bin/git-receive-pack
 bin/git-upload-archive
@@ -29,9 +29,9 @@ libexec/git-core/git-commit
 libexec/git-core/git-commit-tree
 libexec/git-core/git-config
 libexec/git-core/git-count-objects
-libexec/git-core/git-cvsexportcommit
-libexec/git-core/git-cvsimport
-libexec/git-core/git-cvsserver
+%%CVS%%libexec/git-core/git-cvsexportcommit
+%%CVS%%libexec/git-core/git-cvsimport
+%%CVS%%libexec/git-core/git-cvsserver
 libexec/git-core/git-daemon
 libexec/git-core/git-describe
 libexec/git-core/git-diff
@@ -126,7 +126,7 @@ libexec/git-core/git-stash
 libexec/git-core/git-status
 libexec/git-core/git-stripspace
 libexec/git-core/git-submodule
-libexec/git-core/git-svn
+%%SVN%%libexec/git-core/git-svn
 libexec/git-core/git-symbolic-ref
 libexec/git-core/git-tag
 libexec/git-core/git-tar-tree
@@ -208,6 +208,297 @@ share/git-core/templates/info/exclude
 %%GUI%%share/gitk/lib/msgs/de.msg
 %%GUI%%share/gitk/lib/msgs/it.msg
 %%GUI%%share/gitk/lib/msgs/sv.msg
+%%HTMLDOCS%%%%DOCSDIR%%/git-citool.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-hash-object.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-lost-found.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-commit-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-count-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-quiltimport.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/index.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-bundle.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitcore-tutorial.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mv.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-blame.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-archimport.txt
+%%HTMLDOCS%%%%DOCSDIR%%/everyday.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitcli.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-shortlog.txt
+%%HTMLDOCS%%%%DOCSDIR%%/fetch-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-revert.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-stash.txt
+%%HTMLDOCS%%%%DOCSDIR%%/pretty-formats.txt
+%%HTMLDOCS%%%%DOCSDIR%%/diff-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-send-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/merge-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tools.html
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-apply.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fsck.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cvsserver.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-checkout.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mergetool.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-archive.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-verify-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-ls-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-prune.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-am.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-web--browse.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-grep.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-ls-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-receive-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/maintain-git.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/recover-corrupted-blob-object.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/setup-git-server-over-http.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/update-hook-example.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/rebuild-from-update-hook.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.html
+%%HTMLDOCS%%%%DOCSDIR%%/howto/rebase-and-edit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/using-merge-subtree.html
+%%HTMLDOCS%%%%DOCSDIR%%/howto/revert-branch-rebase.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/separating-topic-branches.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/rebase-from-internal-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto/use-git-daemon.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-one-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fetch-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-log.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fast-import.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fmt-merge-msg.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pack-refs.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rev-parse.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-status.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-repack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/send-pack-pipeline.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-strbuf.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/trivial-merge.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-remote.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-protocol.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-hash.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-diff.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-in-core-index.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-quote.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-lockfile.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-setup.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-revision-walking.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-index-skel.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-gitattributes.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-strbuf.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-parse-options.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-decorate.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-directory-listing.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-object-access.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-revision-walking.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.html
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-run-command.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-builtin.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/api-history-graph.txt
+%%HTMLDOCS%%%%DOCSDIR%%/technical/pack-heuristics.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gittutorial.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-help.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gittutorial-2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-filter-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-unpack-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/everyday.html
+%%HTMLDOCS%%%%DOCSDIR%%/git-format-patch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-name-rev.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-symbolic-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-reset.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-commit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/urls-remotes.txt
+%%HTMLDOCS%%%%DOCSDIR%%/githooks.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-instaweb.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-upload-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/blame-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-describe.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cvsexportcommit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mailsplit.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-reflog.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cvsimport.txt
+%%HTMLDOCS%%%%DOCSDIR%%/user-manual.html
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-gui.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-sh-setup.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cherry-pick.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fetch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-clean.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/diff-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pack-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-add.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-repo-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff-files.txt
+%%HTMLDOCS%%%%DOCSDIR%%/pretty-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-imap-send.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-http-push.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-submodule.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fsck-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/merge-strategies.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-for-each-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show-branch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-parse-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-whatchanged.txt
+%%HTMLDOCS%%%%DOCSDIR%%/docbook-xsl.css
+%%HTMLDOCS%%%%DOCSDIR%%/git-var.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-clone.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rev-list.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mailinfo.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.8.txt
+%%HTMLDOCS%%%%DOCSDIR%%/user-manual.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-init-db.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pull.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cat-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-pack-redundant.txt
+%%HTMLDOCS%%%%DOCSDIR%%/merge-config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-init.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitk.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitrepository-layout.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tar-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitglossary.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-relink.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-update-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-push.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-request-pull.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.2.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-update-server-info.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mktag.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-daemon.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-index-pack.txt
+%%HTMLDOCS%%%%DOCSDIR%%/rev-list-options.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rerere.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-fast-export.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-get-tar-commit-id.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/diff-generate-patch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-patch-id.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitcvs-migration.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-cherry.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-upload-archive.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/glossary-content.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitignore.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-base.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-checkout-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge-file.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/howto-index.html
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.5.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-shell.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-mktree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-read-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tag.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-write-tree.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-svn.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-ls-files.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.4.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-stripspace.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-prune-packed.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rm.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.3.7.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-attr.txt
+%%HTMLDOCS%%%%DOCSDIR%%/config.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-http-fetch.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-annotate.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitmodules.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/pull-fetch-param.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.6.txt
+%%HTMLDOCS%%%%DOCSDIR%%/urls.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-peek-remote.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-bisect.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-tools.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-show-ref.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-rebase.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-verify-tag.txt
+%%HTMLDOCS%%%%DOCSDIR%%/i18n.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.0.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-merge.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-gc.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitattributes.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-update-index.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.5.5.3.txt
+%%HTMLDOCS%%%%DOCSDIR%%/gitdiffcore.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-check-ref-format.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-unpack-objects.txt
+%%HTMLDOCS%%%%DOCSDIR%%/git-diff.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
@@ -227,6 +518,9 @@ share/git-core/templates/info/exclude
 %%GUI%%@dirrm share/git-gui/lib/msgs
 %%GUI%%@dirrm share/git-gui/lib
 %%GUI%%@dirrm share/git-gui
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%/technical
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%/howto
+%%HTMLDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/git-core
 @dirrm share/git-core/templates/branches
 @dirrmtry share/git-core/templates/hooks