{"thread":{"id":"1857","subject":"[PATCH 0/2] Improve man pages formatting","startedAt":"2005-09-19T10:09:14Z","lastAt":"2005-09-19T10:10:51Z","messageCount":3,"participants":["Sergey Vlasov"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"8845","messageId":"20050919100914.GA28095@master.mivlgu.local","threadId":"1857","inReplyTo":null,"subject":"[PATCH 0/2] Improve man pages formatting","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2005-09-19T10:09:14Z","receivedAt":"2005-09-19T10:09:14Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"Hello!\n\nCurrently GIT man pages - especially git(7) - do not look good,\nbecause the references to other man pages are represented as HTML file\nnames (like \"git-cat-file: git-cat-file.html\").  The standard\nconvention for such references in man pages is PAGE(SECTION), and some\nman viewers (e.g., pinfo (pman), or KDE help) even treat such text in\nman pages as hyperlinks.\n\nThis problem was fixed in cogito by adding the \"gitlink:\" asciidoc\nmacro which generates proper formatting for either HTML or man page\noutput.  I have adapted that patch for GIT.\n\n-- \nSergey Vlasov\n"},{"id":"8846","messageId":"20050919101014.GB28095@master.mivlgu.local","threadId":"1857","inReplyTo":"20050919100914.GA28095@master.mivlgu.local","subject":"[PATCH 1/2] Documentation: Add asciidoc.conf file and gitlink: macro","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2005-09-19T10:10:14Z","receivedAt":"2005-09-19T10:10:14Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"Introduce an asciidoc.conf file with the purpose of adding a gitlink:\nmacro which will improve the manpage output.\n\nOriginal cogito patch by Jonas Fonseca <fonseca@diku.dk>;\nasciidoc.conf from that patch was further enhanced to use the proper\nDocBook tag <citerefentry> for references to man pages.\n\nSigned-off-by: Sergey Vlasov <vsu@altlinux.ru>\n\n\n---\n\n Documentation/Makefile      |    4 ++--\n Documentation/asciidoc.conf |   21 +++++++++++++++++++++\n 2 files changed, 23 insertions(+), 2 deletions(-)\n create mode 100644 Documentation/asciidoc.conf\n\n9cd024949ba411edbb041faf03bdc03c825e76b4\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -57,13 +57,13 @@ clean:\n \trm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html\n \n %.html : %.txt\n-\tasciidoc -b xhtml11 -d manpage $<\n+\tasciidoc -b xhtml11 -d manpage -f asciidoc.conf $<\n \n %.1 %.7 : %.xml\n \txmlto man $<\n \n %.xml : %.txt\n-\tasciidoc -b docbook -d manpage $<\n+\tasciidoc -b docbook -d manpage -f asciidoc.conf $<\n \n git.html: git.txt ../README\n \ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nnew file mode 100644\n--- /dev/null\n+++ b/Documentation/asciidoc.conf\n@@ -0,0 +1,21 @@\n+## gitlink: macro\n+#\n+# Usage: gitlink:command[manpage-section]\n+#\n+# Note, {0} is the manpage section, while {target} is the command.\n+#\n+# Show GIT link as: <command>(<section>); if section is defined, else just show\n+# the command.\n+\n+ifdef::backend-docbook[]\n+[gitlink-inlinemacro]\n+{0%{target}}\n+{0#<citerefentry>}\n+{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}\n+{0#</citerefentry>}\n+endif::backend-docbook[]\n+\n+ifdef::backend-xhtml11[]\n+[gitlink-inlinemacro]\n+<a href=\"{target}.html\">{target}{0?({0})}</a>\n+endif::backend-xhtml11[]\n"},{"id":"8847","messageId":"20050919101051.GC28095@master.mivlgu.local","threadId":"1857","inReplyTo":"20050919100914.GA28095@master.mivlgu.local","subject":"[PATCH 2/2] Documentation: Update all files to use the new gitlink: macro","fromName":"Sergey Vlasov","fromEmail":"vsu@altlinux.ru","sentAt":"2005-09-19T10:10:51Z","receivedAt":"2005-09-19T10:10:51Z","isPatch":true,"sender":{"key":"vsu@altlinux.ru","avatar":"https://avatars.githubusercontent.com/u/616082?v=4"},"body":"The replacement was performed automatically by these commands:\n\n\tperl -pi -e 's/link:(git.+)\\.html\\[\\1\\]/gitlink:$1\\[1\\]/g' \\\n\t\tREADME Documentation/*.txt\n\tperl -pi -e 's/link:git\\.html\\[git\\]/gitlink:git\\[7\\]/g' \\\n\t\tREADME Documentation/*.txt\n\nSigned-off-by: Sergey Vlasov <vsu@altlinux.ru>\n\n\n---\n\n Documentation/git-add.txt                |    2 \n Documentation/git-apply.txt              |    2 \n Documentation/git-applymbox.txt          |    4 -\n Documentation/git-applypatch.txt         |    2 \n Documentation/git-archimport.txt         |    2 \n Documentation/git-bisect.txt             |    2 \n Documentation/git-branch.txt             |    2 \n Documentation/git-cat-file.txt           |    2 \n Documentation/git-checkout-index.txt     |    2 \n Documentation/git-checkout.txt           |    2 \n Documentation/git-cherry-pick.txt        |    2 \n Documentation/git-cherry.txt             |    2 \n Documentation/git-clone-pack.txt         |    2 \n Documentation/git-clone.txt              |    2 \n Documentation/git-commit-tree.txt        |    4 -\n Documentation/git-commit.txt             |    2 \n Documentation/git-convert-objects.txt    |    2 \n Documentation/git-count-objects.txt      |    2 \n Documentation/git-cvsimport.txt          |    2 \n Documentation/git-daemon.txt             |    2 \n Documentation/git-diff-files.txt         |    2 \n Documentation/git-diff-helper.txt        |    4 -\n Documentation/git-diff-index.txt         |    2 \n Documentation/git-diff-stages.txt        |    2 \n Documentation/git-diff-tree.txt          |    2 \n Documentation/git-diff.txt               |    2 \n Documentation/git-export.txt             |    2 \n Documentation/git-fetch-pack.txt         |    2 \n Documentation/git-fetch.txt              |    2 \n Documentation/git-format-patch.txt       |    2 \n Documentation/git-fsck-objects.txt       |    2 \n Documentation/git-get-tar-commit-id.txt  |    2 \n Documentation/git-grep.txt               |    2 \n Documentation/git-hash-object.txt        |    2 \n Documentation/git-http-fetch.txt         |    2 \n Documentation/git-init-db.txt            |    2 \n Documentation/git-local-fetch.txt        |    2 \n Documentation/git-log.txt                |    2 \n Documentation/git-ls-files.txt           |    4 -\n Documentation/git-ls-remote.txt          |    2 \n Documentation/git-ls-tree.txt            |    2 \n Documentation/git-mailinfo.txt           |    2 \n Documentation/git-mailsplit.txt          |    2 \n Documentation/git-merge-base.txt         |    2 \n Documentation/git-merge-index.txt        |    2 \n Documentation/git-merge-one-file.txt     |    2 \n Documentation/git-merge.txt              |    2 \n Documentation/git-mktag.txt              |    2 \n Documentation/git-octopus.txt            |    2 \n Documentation/git-pack-objects.txt       |    2 \n Documentation/git-parse-remote.txt       |    2 \n Documentation/git-patch-id.txt           |    2 \n Documentation/git-peek-remote.txt        |    2 \n Documentation/git-prune-packed.txt       |    2 \n Documentation/git-prune.txt              |    2 \n Documentation/git-pull.txt               |    2 \n Documentation/git-push.txt               |    2 \n Documentation/git-read-tree.txt          |    4 -\n Documentation/git-rebase.txt             |    2 \n Documentation/git-receive-pack.txt       |    4 -\n Documentation/git-relink.txt             |    2 \n Documentation/git-rename.txt             |    2 \n Documentation/git-repack.txt             |    2 \n Documentation/git-request-pull.txt       |    2 \n Documentation/git-reset.txt              |    2 \n Documentation/git-resolve.txt            |    2 \n Documentation/git-rev-list.txt           |    2 \n Documentation/git-rev-parse.txt          |    2 \n Documentation/git-rev-tree.txt           |    2 \n Documentation/git-revert.txt             |    2 \n Documentation/git-send-email.txt         |    2 \n Documentation/git-send-pack.txt          |    2 \n Documentation/git-sh-setup.txt           |    2 \n Documentation/git-shortlog.txt           |    2 \n Documentation/git-show-branch.txt        |    2 \n Documentation/git-show-index.txt         |    2 \n Documentation/git-ssh-fetch.txt          |    2 \n Documentation/git-ssh-upload.txt         |    2 \n Documentation/git-status.txt             |    2 \n Documentation/git-stripspace.txt         |    2 \n Documentation/git-tag.txt                |    2 \n Documentation/git-tar-tree.txt           |    2 \n Documentation/git-unpack-file.txt        |    2 \n Documentation/git-unpack-objects.txt     |    2 \n Documentation/git-update-index.txt       |    2 \n Documentation/git-update-server-info.txt |    2 \n Documentation/git-upload-pack.txt        |    2 \n Documentation/git-var.txt                |    6 -\n Documentation/git-verify-pack.txt        |    2 \n Documentation/git-verify-tag.txt         |    2 \n Documentation/git-whatchanged.txt        |    2 \n Documentation/git-write-tree.txt         |    2 \n Documentation/git.txt                    |  200 +++++++++++++++---------------\n Documentation/gitk.txt                   |    2 \n README                                   |   24 ++--\n 95 files changed, 213 insertions(+), 213 deletions(-)\n\n03f3ac7ade700dbd95c91e21a77ed1f4cbf4edb8\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -29,5 +29,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -72,5 +72,5 @@ Documentation by Junio C Hamano\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt\n--- a/Documentation/git-applymbox.txt\n+++ b/Documentation/git-applymbox.txt\n@@ -67,7 +67,7 @@ OPTIONS\n \n SEE ALSO\n --------\n-link:git-applypatch.html[git-applypatch].\n+gitlink:git-applypatch[1].\n \n \n Author\n@@ -80,5 +80,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-applypatch.txt b/Documentation/git-applypatch.txt\n--- a/Documentation/git-applypatch.txt\n+++ b/Documentation/git-applypatch.txt\n@@ -46,5 +46,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt\n--- a/Documentation/git-archimport.txt\n+++ b/Documentation/git-archimport.txt\n@@ -78,5 +78,5 @@ Documentation by Junio C Hamano, Martin \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt\n--- a/Documentation/git-bisect.txt\n+++ b/Documentation/git-bisect.txt\n@@ -96,5 +96,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -35,5 +35,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt\n--- a/Documentation/git-cat-file.txt\n+++ b/Documentation/git-cat-file.txt\n@@ -57,5 +57,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -102,5 +102,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -39,5 +39,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -53,5 +53,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt\n--- a/Documentation/git-cherry.txt\n+++ b/Documentation/git-cherry.txt\n@@ -38,5 +38,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-clone-pack.txt b/Documentation/git-clone-pack.txt\n--- a/Documentation/git-clone-pack.txt\n+++ b/Documentation/git-clone-pack.txt\n@@ -61,5 +61,5 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -56,5 +56,5 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -75,7 +75,7 @@ Your sysadmin must hate you!::\n \n See Also\n --------\n-link:git-write-tree.html[git-write-tree]\n+gitlink:git-write-tree[1]\n \n \n Author\n@@ -88,5 +88,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -69,4 +69,4 @@ Junio C Hamano <junkio@cox.net>\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-convert-objects.txt b/Documentation/git-convert-objects.txt\n--- a/Documentation/git-convert-objects.txt\n+++ b/Documentation/git-convert-objects.txt\n@@ -26,5 +26,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt\n--- a/Documentation/git-count-objects.txt\n+++ b/Documentation/git-count-objects.txt\n@@ -24,5 +24,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt\n--- a/Documentation/git-cvsimport.txt\n+++ b/Documentation/git-cvsimport.txt\n@@ -105,5 +105,5 @@ Documentation by Matthias Urlichs <smurf\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt\n--- a/Documentation/git-daemon.txt\n+++ b/Documentation/git-daemon.txt\n@@ -42,5 +42,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt\n--- a/Documentation/git-diff-files.txt\n+++ b/Documentation/git-diff-files.txt\n@@ -40,5 +40,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-diff-helper.txt b/Documentation/git-diff-helper.txt\n--- a/Documentation/git-diff-helper.txt\n+++ b/Documentation/git-diff-helper.txt\n@@ -35,7 +35,7 @@ OPTIONS\n \n See Also\n --------\n-The section on generating patches in link:git-diff-index.html[git-diff-index]\n+The section on generating patches in gitlink:git-diff-index[1]\n \n \n Author\n@@ -49,5 +49,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt\n--- a/Documentation/git-diff-index.txt\n+++ b/Documentation/git-diff-index.txt\n@@ -130,5 +130,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-diff-stages.txt b/Documentation/git-diff-stages.txt\n--- a/Documentation/git-diff-stages.txt\n+++ b/Documentation/git-diff-stages.txt\n@@ -38,4 +38,4 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt\n--- a/Documentation/git-diff-tree.txt\n+++ b/Documentation/git-diff-tree.txt\n@@ -126,5 +126,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -48,5 +48,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-export.txt b/Documentation/git-export.txt\n--- a/Documentation/git-export.txt\n+++ b/Documentation/git-export.txt\n@@ -27,5 +27,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt\n--- a/Documentation/git-fetch-pack.txt\n+++ b/Documentation/git-fetch-pack.txt\n@@ -66,4 +66,4 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt\n--- a/Documentation/git-fetch.txt\n+++ b/Documentation/git-fetch.txt\n@@ -44,4 +44,4 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -65,5 +65,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.txt\n--- a/Documentation/git-fsck-objects.txt\n+++ b/Documentation/git-fsck-objects.txt\n@@ -141,5 +141,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt\n--- a/Documentation/git-get-tar-commit-id.txt\n+++ b/Documentation/git-get-tar-commit-id.txt\n@@ -33,5 +33,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -43,5 +43,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt\n--- a/Documentation/git-hash-object.txt\n+++ b/Documentation/git-hash-object.txt\n@@ -40,5 +40,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt\n--- a/Documentation/git-http-fetch.txt\n+++ b/Documentation/git-http-fetch.txt\n@@ -38,5 +38,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt\n--- a/Documentation/git-init-db.txt\n+++ b/Documentation/git-init-db.txt\n@@ -37,5 +37,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt\n--- a/Documentation/git-local-fetch.txt\n+++ b/Documentation/git-local-fetch.txt\n@@ -40,5 +40,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -41,5 +41,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -180,7 +180,7 @@ An example:\n \n See Also\n --------\n-link:git-read-tree.html[git-read-tree]\n+gitlink:git-read-tree[1]\n \n \n Author\n@@ -193,5 +193,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt\n--- a/Documentation/git-ls-remote.txt\n+++ b/Documentation/git-ls-remote.txt\n@@ -60,5 +60,5 @@ Written by Junio C Hamano <junkio@cox.ne\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt\n--- a/Documentation/git-ls-tree.txt\n+++ b/Documentation/git-ls-tree.txt\n@@ -51,5 +51,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt\n--- a/Documentation/git-mailinfo.txt\n+++ b/Documentation/git-mailinfo.txt\n@@ -61,5 +61,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-mailsplit.txt b/Documentation/git-mailsplit.txt\n--- a/Documentation/git-mailsplit.txt\n+++ b/Documentation/git-mailsplit.txt\n@@ -32,5 +32,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt\n--- a/Documentation/git-merge-base.txt\n+++ b/Documentation/git-merge-base.txt\n@@ -30,5 +30,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt\n--- a/Documentation/git-merge-index.txt\n+++ b/Documentation/git-merge-index.txt\n@@ -85,5 +85,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt\n--- a/Documentation/git-merge-one-file.txt\n+++ b/Documentation/git-merge-one-file.txt\n@@ -27,5 +27,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -49,4 +49,4 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt\n--- a/Documentation/git-mktag.txt\n+++ b/Documentation/git-mktag.txt\n@@ -44,5 +44,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-octopus.txt b/Documentation/git-octopus.txt\n--- a/Documentation/git-octopus.txt\n+++ b/Documentation/git-octopus.txt\n@@ -35,5 +35,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt\n--- a/Documentation/git-pack-objects.txt\n+++ b/Documentation/git-pack-objects.txt\n@@ -80,5 +80,5 @@ git-repack(1) git-prune-packed(1)\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt\n--- a/Documentation/git-parse-remote.txt\n+++ b/Documentation/git-parse-remote.txt\n@@ -45,4 +45,4 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt\n--- a/Documentation/git-patch-id.txt\n+++ b/Documentation/git-patch-id.txt\n@@ -33,5 +33,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-peek-remote.txt b/Documentation/git-peek-remote.txt\n--- a/Documentation/git-peek-remote.txt\n+++ b/Documentation/git-peek-remote.txt\n@@ -49,5 +49,5 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt\n--- a/Documentation/git-prune-packed.txt\n+++ b/Documentation/git-prune-packed.txt\n@@ -38,5 +38,5 @@ git-pack-objects(1) git-repack(1)\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt\n--- a/Documentation/git-prune.txt\n+++ b/Documentation/git-prune.txt\n@@ -39,5 +39,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -37,5 +37,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -32,5 +32,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -251,7 +251,7 @@ updated to the result of the merge.\n \n See Also\n --------\n-link:git-write-tree.html[git-write-tree]; link:git-ls-files.html[git-ls-files]\n+gitlink:git-write-tree[1]; gitlink:git-ls-files[1]\n \n \n Author\n@@ -264,5 +264,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -31,5 +31,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt\n--- a/Documentation/git-receive-pack.txt\n+++ b/Documentation/git-receive-pack.txt\n@@ -80,7 +80,7 @@ OPTIONS\n \n SEE ALSO\n --------\n-link:git-send-pack.html[git-send-pack]\n+gitlink:git-send-pack[1]\n \n \n Author\n@@ -93,4 +93,4 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-relink.txt b/Documentation/git-relink.txt\n--- a/Documentation/git-relink.txt\n+++ b/Documentation/git-relink.txt\n@@ -33,5 +33,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-rename.txt b/Documentation/git-rename.txt\n--- a/Documentation/git-rename.txt\n+++ b/Documentation/git-rename.txt\n@@ -29,5 +29,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt\n--- a/Documentation/git-repack.txt\n+++ b/Documentation/git-repack.txt\n@@ -55,5 +55,5 @@ git-pack-objects(1) git-prune-packed(1)\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-request-pull.txt b/Documentation/git-request-pull.txt\n--- a/Documentation/git-request-pull.txt\n+++ b/Documentation/git-request-pull.txt\n@@ -36,5 +36,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -41,5 +41,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-resolve.txt b/Documentation/git-resolve.txt\n--- a/Documentation/git-resolve.txt\n+++ b/Documentation/git-resolve.txt\n@@ -33,5 +33,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -95,5 +95,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -122,5 +122,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-rev-tree.txt b/Documentation/git-rev-tree.txt\n--- a/Documentation/git-rev-tree.txt\n+++ b/Documentation/git-rev-tree.txt\n@@ -84,5 +84,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt\n--- a/Documentation/git-revert.txt\n+++ b/Documentation/git-revert.txt\n@@ -44,5 +44,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt\n--- a/Documentation/git-send-email.txt\n+++ b/Documentation/git-send-email.txt\n@@ -75,5 +75,5 @@ Documentation by Ryan Anderson\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt\n--- a/Documentation/git-send-pack.txt\n+++ b/Documentation/git-send-pack.txt\n@@ -108,4 +108,4 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt\n--- a/Documentation/git-sh-setup.txt\n+++ b/Documentation/git-sh-setup.txt\n@@ -30,5 +30,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt\n--- a/Documentation/git-shortlog.txt\n+++ b/Documentation/git-shortlog.txt\n@@ -27,5 +27,5 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -117,4 +117,4 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt\n--- a/Documentation/git-show-index.txt\n+++ b/Documentation/git-show-index.txt\n@@ -32,5 +32,5 @@ Documentation by Junio C Hamano\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-ssh-fetch.txt b/Documentation/git-ssh-fetch.txt\n--- a/Documentation/git-ssh-fetch.txt\n+++ b/Documentation/git-ssh-fetch.txt\n@@ -48,5 +48,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-ssh-upload.txt b/Documentation/git-ssh-upload.txt\n--- a/Documentation/git-ssh-upload.txt\n+++ b/Documentation/git-ssh-upload.txt\n@@ -44,5 +44,5 @@ Documentation by Daniel Barkalow\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -42,5 +42,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt\n--- a/Documentation/git-stripspace.txt\n+++ b/Documentation/git-stripspace.txt\n@@ -29,5 +29,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\n--- a/Documentation/git-tag.txt\n+++ b/Documentation/git-tag.txt\n@@ -36,4 +36,4 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-tar-tree.txt b/Documentation/git-tar-tree.txt\n--- a/Documentation/git-tar-tree.txt\n+++ b/Documentation/git-tar-tree.txt\n@@ -35,5 +35,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt\n--- a/Documentation/git-unpack-file.txt\n+++ b/Documentation/git-unpack-file.txt\n@@ -33,5 +33,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt\n--- a/Documentation/git-unpack-objects.txt\n+++ b/Documentation/git-unpack-objects.txt\n@@ -35,5 +35,5 @@ Documentation by Junio C Hamano\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -122,5 +122,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt\n--- a/Documentation/git-update-server-info.txt\n+++ b/Documentation/git-update-server-info.txt\n@@ -55,5 +55,5 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt\n--- a/Documentation/git-upload-pack.txt\n+++ b/Documentation/git-upload-pack.txt\n@@ -37,4 +37,4 @@ Documentation by Junio C Hamano.\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\ndiff --git a/Documentation/git-var.txt b/Documentation/git-var.txt\n--- a/Documentation/git-var.txt\n+++ b/Documentation/git-var.txt\n@@ -43,8 +43,8 @@ Your sysadmin must hate you!::\n \n See Also\n --------\n-link:git-commit-tree.html[git-commit-tree]\n-link:git-tag.html[git-tag]\n+gitlink:git-commit-tree[1]\n+gitlink:git-tag[1]\n \n Author\n ------\n@@ -56,5 +56,5 @@ Documentation by Eric Biederman and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt\n--- a/Documentation/git-verify-pack.txt\n+++ b/Documentation/git-verify-pack.txt\n@@ -45,5 +45,5 @@ Documentation by Junio C Hamano\n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-verify-tag.txt b/Documentation/git-verify-tag.txt\n--- a/Documentation/git-verify-tag.txt\n+++ b/Documentation/git-verify-tag.txt\n@@ -28,5 +28,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt\n--- a/Documentation/git-whatchanged.txt\n+++ b/Documentation/git-whatchanged.txt\n@@ -57,5 +57,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt\n--- a/Documentation/git-write-tree.txt\n+++ b/Documentation/git-write-tree.txt\n@@ -39,5 +39,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/git.txt b/Documentation/git.txt\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -21,8 +21,8 @@ at the link:tutorial.html[tutorial] docu\n \n The <<Discussion>> section below contains much useful definition and\n clarification info - read that first.  And of the commands, I suggest\n-reading link:git-update-index.html[git-update-index] and\n-link:git-read-tree.html[git-read-tree] first - I wish I had!\n+reading gitlink:git-update-index[1] and\n+gitlink:git-read-tree[1] first - I wish I had!\n \n If you are migrating from CVS, link:cvs-migration.html[cvs migration]\n document may be helpful after you finish the tutorial.\n@@ -55,104 +55,104 @@ SCMs layered over git.\n \n Manipulation commands\n ~~~~~~~~~~~~~~~~~~~~~\n-link:git-apply.html[git-apply]::\n+gitlink:git-apply[1]::\n \tReads a \"diff -up1\" or git generated patch file and\n \tapplies it to the working tree.\n \n-link:git-checkout-index.html[git-checkout-index]::\n+gitlink:git-checkout-index[1]::\n \tCopy files from the cache to the working directory\n \tPreviously this command was known as git-checkout-cache.\n \n-link:git-commit-tree.html[git-commit-tree]::\n+gitlink:git-commit-tree[1]::\n \tCreates a new commit object\n \n-link:git-hash-object.html[git-hash-object]::\n+gitlink:git-hash-object[1]::\n \tComputes the object ID from a file.\n \n-link:git-init-db.html[git-init-db]::\n+gitlink:git-init-db[1]::\n \tCreates an empty git object database\n \n-link:git-merge-index.html[git-merge-index]::\n+gitlink:git-merge-index[1]::\n \tRuns a merge for files needing merging\n \tPreviously this command was known as git-merge-cache.\n \n-link:git-mktag.html[git-mktag]::\n+gitlink:git-mktag[1]::\n \tCreates a tag object\n \n-link:git-pack-objects.html[git-pack-objects]::\n+gitlink:git-pack-objects[1]::\n \tCreates a packed archive of objects.\n \n-link:git-prune-packed.html[git-prune-packed]::\n+gitlink:git-prune-packed[1]::\n \tRemove extra objects that are already in pack files.\n \n-link:git-read-tree.html[git-read-tree]::\n+gitlink:git-read-tree[1]::\n \tReads tree information into the directory cache\n \n-link:git-unpack-objects.html[git-unpack-objects]::\n+gitlink:git-unpack-objects[1]::\n \tUnpacks objects out of a packed archive.\n \n-link:git-update-index.html[git-update-index]::\n+gitlink:git-update-index[1]::\n \tModifies the index or directory cache\n \tPreviously this command was known as git-update-cache.\n \n-link:git-write-tree.html[git-write-tree]::\n+gitlink:git-write-tree[1]::\n \tCreates a tree from the current cache\n \n \n Interrogation commands\n ~~~~~~~~~~~~~~~~~~~~~~\n \n-link:git-cat-file.html[git-cat-file]::\n+gitlink:git-cat-file[1]::\n \tProvide content or type information for repository objects\n \n-link:git-diff-index.html[git-diff-index]::\n+gitlink:git-diff-index[1]::\n \tCompares content and mode of blobs between the cache and repository\n \tPreviously this command was known as git-diff-cache.\n \n-link:git-diff-files.html[git-diff-files]::\n+gitlink:git-diff-files[1]::\n \tCompares files in the working tree and the cache\n \n-link:git-diff-stages.html[git-diff-stages]::\n+gitlink:git-diff-stages[1]::\n \tCompares two \"merge stages\" in the index file.\n \n-link:git-diff-tree.html[git-diff-tree]::\n+gitlink:git-diff-tree[1]::\n \tCompares the content and mode of blobs found via two tree objects\n \n-link:git-export.html[git-export]::\n+gitlink:git-export[1]::\n \tExports each commit and a diff against each of its parents\n \n-link:git-fsck-objects.html[git-fsck-objects]::\n+gitlink:git-fsck-objects[1]::\n \tVerifies the connectivity and validity of the objects in the database\n \tPreviously this command was known as git-fsck-cache.\n \n-link:git-ls-files.html[git-ls-files]::\n+gitlink:git-ls-files[1]::\n \tInformation about files in the cache/working directory\n \n-link:git-ls-tree.html[git-ls-tree]::\n+gitlink:git-ls-tree[1]::\n \tDisplays a tree object in human readable form\n \n-link:git-merge-base.html[git-merge-base]::\n+gitlink:git-merge-base[1]::\n \tFinds as good a common ancestor as possible for a merge\n \n-link:git-rev-list.html[git-rev-list]::\n+gitlink:git-rev-list[1]::\n \tLists commit objects in reverse chronological order\n \n-link:git-rev-tree.html[git-rev-tree]::\n+gitlink:git-rev-tree[1]::\n \tProvides the revision tree for one or more commits\n \n-link:git-show-index.html[git-show-index]::\n+gitlink:git-show-index[1]::\n \tDisplays contents of a pack idx file.\n \n-link:git-tar-tree.html[git-tar-tree]::\n+gitlink:git-tar-tree[1]::\n \tCreates a tar archive of the files in the named tree\n \n-link:git-unpack-file.html[git-unpack-file]::\n+gitlink:git-unpack-file[1]::\n \tCreates a temporary file with a blob's contents\n \n-link:git-var.html[git-var]::\n+gitlink:git-var[1]::\n \tDisplays a git logical variable\n \n-link:git-verify-pack.html[git-verify-pack]::\n+gitlink:git-verify-pack[1]::\n \tValidates packed GIT archive files\n \n The interrogate commands may create files - and you can force them to\n@@ -162,43 +162,43 @@ touch the working file set - but in gene\n Synching repositories\n ~~~~~~~~~~~~~~~~~~~~~\n \n-link:git-clone-pack.html[git-clone-pack]::\n+gitlink:git-clone-pack[1]::\n \tClones a repository into the current repository (engine\n \tfor ssh and local transport)\n \n-link:git-fetch-pack.html[git-fetch-pack]::\n+gitlink:git-fetch-pack[1]::\n \tUpdates from a remote repository.\n \n-link:git-http-fetch.html[git-http-fetch]::\n+gitlink:git-http-fetch[1]::\n \tDownloads a remote GIT repository via HTTP\n \tPreviously this command was known as git-http-pull.\n \n-link:git-local-fetch.html[git-local-fetch]::\n+gitlink:git-local-fetch[1]::\n \tDuplicates another GIT repository on a local system\n \tPreviously this command was known as git-local-pull.\n \n-link:git-peek-remote.html[git-peek-remote]::\n+gitlink:git-peek-remote[1]::\n \tLists references on a remote repository using upload-pack protocol.\n \n-link:git-receive-pack.html[git-receive-pack]::\n+gitlink:git-receive-pack[1]::\n \tInvoked by 'git-send-pack' to receive what is pushed to it.\n \n-link:git-send-pack.html[git-send-pack]::\n+gitlink:git-send-pack[1]::\n \tPushes to a remote repository, intelligently.\n \n-link:git-ssh-fetch.html[git-ssh-fetch]::\n+gitlink:git-ssh-fetch[1]::\n \tPulls from a remote repository over ssh connection\n \tPreviously this command was known as git-ssh-pull.\n \n-link:git-ssh-upload.html[git-ssh-upload]::\n+gitlink:git-ssh-upload[1]::\n \tHelper \"server-side\" program used by git-ssh-fetch\n \tPreviously this command was known as git-ssh-push.\n \n-link:git-update-server-info.html[git-update-server-info]::\n+gitlink:git-update-server-info[1]::\n \tUpdates auxiliary information on a dumb server to help\n \tclients discover references and packs on it.\n \n-link:git-upload-pack.html[git-upload-pack]::\n+gitlink:git-upload-pack[1]::\n \tInvoked by 'git-clone-pack' and 'git-fetch-pack' to push\n \twhat are asked for.\n \n@@ -206,114 +206,114 @@ link:git-upload-pack.html[git-upload-pac\n Porcelain-ish Commands\n ----------------------\n \n-link:git-add.html[git-add]::\n+gitlink:git-add[1]::\n \tAdd paths to the index file.\n \tPreviously this command was known as git-add-script.\n \n-link:git-applymbox.html[git-applymbox]::\n+gitlink:git-applymbox[1]::\n \tApply patches from a mailbox.\n \n-link:git-bisect.html[git-bisect]::\n+gitlink:git-bisect[1]::\n \tFind the change that introduced a bug.\n \tPreviously this command was known as git-bisect-script.\n \n-link:git-branch.html[git-branch]::\n+gitlink:git-branch[1]::\n \tCreate and Show branches.\n \tPreviously this command was known as git-branch-script.\n \n-link:git-checkout.html[git-checkout]::\n+gitlink:git-checkout[1]::\n \tCheckout and switch to a branch.\n \tPreviously this command was known as git-checkout-script.\n \n-link:git-cherry-pick.html[git-cherry-pick]::\n+gitlink:git-cherry-pick[1]::\n \tCherry-pick the effect of an existing commit.\n \tPreviously this command was known as git-cherry-pick-script.\n \n-link:git-clone.html[git-clone]::\n+gitlink:git-clone[1]::\n \tClones a repository into a new directory.\n \tPreviously this command was known as git-clone-script.\n \n-link:git-commit.html[git-commit]::\n+gitlink:git-commit[1]::\n \tRecord changes to the repository.\n \tPreviously this command was known as git-commit-script.\n \n-link:git-diff.html[git-diff]::\n+gitlink:git-diff[1]::\n \tShow changes between commits, commit and working tree, etc.\n \tPreviously this command was known as git-diff-script.\n \n-link:git-fetch.html[git-fetch]::\n+gitlink:git-fetch[1]::\n \tDownload from a remote repository via various protocols.\n \tPreviously this command was known as git-fetch-script.\n \n-link:git-format-patch.html[git-format-patch]::\n+gitlink:git-format-patch[1]::\n \tPrepare patches for e-mail submission.\n \tPreviously this command was known as git-format-patch-script.\n \n-link:git-grep.html[git-grep]::\n+gitlink:git-grep[1]::\n \tPrint lines matching a pattern\n \n-link:git-log.html[git-log]::\n+gitlink:git-log[1]::\n \tShows commit logs.\n \tPreviously this command was known as git-log-script.\n \n-link:git-ls-remote.html[git-ls-remote]::\n+gitlink:git-ls-remote[1]::\n \tShows references in a remote or local repository.\n \tPreviously this command was known as git-ls-remote-script.\n \n-link:git-merge.html[git-merge]::\n+gitlink:git-merge[1]::\n \tGrand unified merge driver.\n \n-link:git-octopus.html[git-octopus]::\n+gitlink:git-octopus[1]::\n \tMerge more than two commits.\n \tPreviously this command was known as git-octopus-script.\n \n-link:git-pull.html[git-pull]::\n+gitlink:git-pull[1]::\n \tFetch from and merge with a remote repository.\n \tPreviously this command was known as git-pull-script.\n \n-link:git-push.html[git-push]::\n+gitlink:git-push[1]::\n \tUpdate remote refs along with associated objects.\n \tPreviously this command was known as git-push-script.\n \n-link:git-rebase.html[git-rebase]::\n+gitlink:git-rebase[1]::\n \tRebase local commits to new upstream head.\n \tPreviously this command was known as git-rebase-script.\n \n-link:git-rename.html[git-rename]::\n+gitlink:git-rename[1]::\n \tRename files and directories.\n \tPreviously this command was known as git-rename-script.\n \n-link:git-repack.html[git-repack]::\n+gitlink:git-repack[1]::\n \tPack unpacked objects in a repository.\n \tPreviously this command was known as git-repack-script.\n \n-link:git-reset.html[git-reset]::\n+gitlink:git-reset[1]::\n \tReset current HEAD to the specified state.\n \tPreviously this command was known as git-reset-script.\n \n-link:git-resolve.html[git-resolve]::\n+gitlink:git-resolve[1]::\n \tMerge two commits.\n \tPreviously this command was known as git-resolve-script.\n \n-link:git-revert.html[git-revert]::\n+gitlink:git-revert[1]::\n \tRevert an existing commit.\n \tPreviously this command was known as git-revert-script.\n \n-link:git-shortlog.html[git-shortlog]::\n+gitlink:git-shortlog[1]::\n \tSummarizes 'git log' output.\n \n-link:git-show-branch.html[git-show-branch]::\n+gitlink:git-show-branch[1]::\n \tShow branches and their commits.\n \n-link:git-status.html[git-status]::\n+gitlink:git-status[1]::\n \tShows the working tree status.\n \tPreviously this command was known as git-status-script.\n \n-link:git-verify-tag.html[git-verify-tag]::\n+gitlink:git-verify-tag[1]::\n \tCheck the GPG signature of tag.\n \tPreviously this command was known as git-verify-tag-script.\n \n-link:git-whatchanged.html[git-whatchanged]::\n+gitlink:git-whatchanged[1]::\n \tShows commit logs and differences they introduce.\n \n \n@@ -321,92 +321,92 @@ Ancillary Commands\n ------------------\n Manipulators:\n \n-link:git-applypatch.html[git-applypatch]::\n+gitlink:git-applypatch[1]::\n \tApply one patch extracted from an e-mail.\n \n-link:git-archimport.html[git-archimport]::\n+gitlink:git-archimport[1]::\n \tImport an arch repository into git.\n \tPreviously this command was known as git-archimport-script.\n \n-link:git-convert-objects.html[git-convert-objects]::\n+gitlink:git-convert-objects[1]::\n \tConverts old-style GIT repository\n \tPreviously this command was known as git-convert-cache.\n \n-link:git-cvsimport.html[git-cvsimport]::\n+gitlink:git-cvsimport[1]::\n \tSalvage your data out of another SCM people love to hate.\n \tPreviously this command was known as git-cvsimport-script.\n \n-link:git-merge-one-file.html[git-merge-one-file]::\n+gitlink:git-merge-one-file[1]::\n \tThe standard helper program to use with \"git-merge-index\"\n \tPreviously this command was known as git-merge-one-file-script.\n \n-link:git-prune.html[git-prune]::\n+gitlink:git-prune[1]::\n \tPrunes all unreachable objects from the object database\n \tPreviously this command was known as git-prune-script.\n \n-link:git-relink.html[git-relink]::\n+gitlink:git-relink[1]::\n \tHardlink common objects in local repositories.\n \tPreviously this command was known as git-relink-script.\n \n-link:git-sh-setup.html[git-sh-setup]::\n+gitlink:git-sh-setup[1]::\n \tCommon git shell script setup code.\n \tPreviously this command was known as git-sh-setup-script.\n \n-link:git-tag.html[git-tag]::\n+gitlink:git-tag[1]::\n \tAn example script to create a tag object signed with GPG\n \tPreviously this command was known as git-tag-script.\n \n \n Interrogators:\n \n-link:git-cherry.html[git-cherry]::\n+gitlink:git-cherry[1]::\n \tFind commits not merged upstream.\n \n-link:git-count-objects.html[git-count-objects]::\n+gitlink:git-count-objects[1]::\n \tCount unpacked number of objects and their disk consumption.\n \tPreviously this command was known as git-count-objects-script.\n \n-link:git-daemon.html[git-daemon]::\n+gitlink:git-daemon[1]::\n \tA really simple server for GIT repositories.\n \n-link:git-diff-helper.html[git-diff-helper]::\n+gitlink:git-diff-helper[1]::\n \tGenerates patch format output for git-diff-*\n \n-link:git-get-tar-commit-id.html[git-get-tar-commit-id]::\n+gitlink:git-get-tar-commit-id[1]::\n \tExtract commit ID from an archive created using git-tar-tree.\n \n-link:git-mailinfo.html[git-mailinfo]::\n+gitlink:git-mailinfo[1]::\n \tExtracts patch from a single e-mail message.\n \n-link:git-mailsplit.html[git-mailsplit]::\n+gitlink:git-mailsplit[1]::\n \tgit-mailsplit.\n \n-link:git-patch-id.html[git-patch-id]::\n+gitlink:git-patch-id[1]::\n \tCompute unique ID for a patch.\n \n-link:git-parse-remote.html[git-parse-remote]::\n+gitlink:git-parse-remote[1]::\n \tRoutines to help parsing $GIT_DIR/remotes/\n \tPreviously this command was known as git-parse-remote-script.\n \n-link:git-request-pull.html[git-request-pull]::\n+gitlink:git-request-pull[1]::\n \tgit-request-pull.\n \tPreviously this command was known as git-request-pull-script.\n \n-link:git-rev-parse.html[git-rev-parse]::\n+gitlink:git-rev-parse[1]::\n \tPick out and massage parameters.\n \n-link:git-send-email.html[git-send-email]::\n+gitlink:git-send-email[1]::\n \tSend patch e-mails out of \"format-patch --mbox\" output.\n \tPreviously this command was known as git-send-email-script.\n \n-link:git-stripspace.html[git-stripspace]::\n+gitlink:git-stripspace[1]::\n \tFilter out empty lines.\n \n \n Commands not yet documented\n ---------------------------\n \n-link:gitk.html[gitk]::\n+gitlink:gitk[1]::\n \tgitk.\n \n \n@@ -511,16 +511,16 @@ git Commits\n 'GIT_AUTHOR_DATE'::\n 'GIT_COMMITTER_NAME'::\n 'GIT_COMMITTER_EMAIL'::\n-\tsee link:git-commit-tree.html[git-commit-tree]\n+\tsee gitlink:git-commit-tree[1]\n \n git Diffs\n ~~~~~~~~~\n 'GIT_DIFF_OPTS'::\n 'GIT_EXTERNAL_DIFF'::\n \tsee the \"generating patches\" section in :\n-\tlink:git-diff-index.html[git-diff-index];\n-\tlink:git-diff-files.html[git-diff-files];\n-\tlink:git-diff-tree.html[git-diff-tree]\n+\tgitlink:git-diff-index[1];\n+\tgitlink:git-diff-files[1];\n+\tgitlink:git-diff-tree[1]\n \n Discussion[[Discussion]]\n ------------------------\n@@ -536,5 +536,5 @@ Documentation by David Greaves, Junio C \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -34,5 +34,5 @@ Documentation by Junio C Hamano and the \n \n GIT\n ---\n-Part of the link:git.html[git] suite\n+Part of the gitlink:git[7] suite\n \ndiff --git a/README b/README\n--- a/README\n+++ b/README\n@@ -104,8 +104,8 @@ object. The object is totally independen\n directory tree, and renaming a file does not change the object that\n file is associated with in any way.\n \n-A blob is typically created when link:git-update-index.html[git-update-index]\n-is run, and its data can be accessed by link:git-cat-file.html[git-cat-file].\n+A blob is typically created when gitlink:git-update-index[1]\n+is run, and its data can be accessed by gitlink:git-cat-file[1].\n \n Tree Object\n ~~~~~~~~~~~\n@@ -143,9 +143,9 @@ involved), you can see trivial renames o\n noticing that the blob stayed the same.  However, renames with data\n changes need a smarter \"diff\" implementation.\n \n-A tree is created with link:git-write-tree.html[git-write-tree] and\n-its data can be accessed by link:git-ls-tree.html[git-ls-tree].\n-Two trees can be compared with link:git-diff-tree.html[git-diff-tree].\n+A tree is created with gitlink:git-write-tree[1] and\n+its data can be accessed by gitlink:git-ls-tree[1].\n+Two trees can be compared with gitlink:git-diff-tree[1].\n \n Commit Object\n ~~~~~~~~~~~~~\n@@ -169,8 +169,8 @@ implicit in the trees involved (the resu\n of the parents), and describing that makes no sense in this idiotic\n file manager.\n \n-A commit is created with link:git-commit-tree.html[git-commit-tree] and\n-its data can be accessed by link:git-cat-file.html[git-cat-file].\n+A commit is created with gitlink:git-commit-tree[1] and\n+its data can be accessed by gitlink:git-cat-file[1].\n \n Trust\n ~~~~~\n@@ -215,10 +215,10 @@ Note that despite the tag features, \"git\n integrity; the trust framework (and signature provision and\n verification) has to come from outside.\n \n-A tag is created with link:git-mktag.html[git-mktag],\n-its data can be accessed by link:git-cat-file.html[git-cat-file],\n+A tag is created with gitlink:git-mktag[1],\n+its data can be accessed by gitlink:git-cat-file[1],\n and the signature can be verified by\n-link:git-verify-tag.html[git-verify-tag].\n+gitlink:git-verify-tag[1].\n \n \n The \"index\" aka \"Current Directory Cache\"\n@@ -286,7 +286,7 @@ main combinations: \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n You update the index with information from the working directory with\n-the link:git-update-index.html[git-update-index] command.  You\n+the gitlink:git-update-index[1] command.  You\n generally update the index information by just specifying the filename\n you want to update, like so:\n \n@@ -404,7 +404,7 @@ last committed state was.\n \n You can examine the data represented in the object database and the\n index with various helper tools. For every object, you can use\n-link:git-cat-file.html[git-cat-file] to examine details about the\n+gitlink:git-cat-file[1] to examine details about the\n object:\n \n \t\tgit-cat-file -t <objectname>\n"}]}