{"thread":{"id":"32784","subject":"git-remote-helpers.txt: should it be gitremote-helpers.txt?","startedAt":"2013-01-30T20:11:02Z","lastAt":"2013-02-01T22:15:13Z","messageCount":32,"participants":["John Keeping","Junio C Hamano","Matthieu Moy","Tomas Carnecky","Jeff King","Jonathan Nieder"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"208312","messageId":"20130130201102.GM1342@serenity.lan","threadId":"32784","inReplyTo":null,"subject":"git-remote-helpers.txt: should it be gitremote-helpers.txt?","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2013-01-30T20:11:02Z","receivedAt":"2013-01-30T20:11:02Z","isPatch":false,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"Max Horn's email today prompted me to try reading the git-remote-helpers\nman page, so I tried:\n\n $ git help remote-helpers\n No manual entry for gitremote-helpers\n\nBut \"man git-remote-helpers\" does work.\n\nIt turns out that \"builtin/help.c\" maps its argument to a page by\nprepending \"git-\" if given the name of a Git command and \"git\"\notherwise.\n\nDoes this mean that \"git-remote-helpers.txt\" should lose the first\nhyphen or is help.c not being clever enough in some way?\n\n\nJohn\n"},{"id":"208314","messageId":"7vfw1ijtz2.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130130201102.GM1342@serenity.lan","subject":"Re: git-remote-helpers.txt: should it be gitremote-helpers.txt?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-30T20:28:49Z","receivedAt":"2013-01-30T20:28:49Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"John Keeping writes:\n\n> Max Horn's email today prompted me to try reading the git-remote-helpers\n> man page, so I tried:\n>\n> $ git help remote-helpers\n> No manual entry for gitremote-helpers\n>\n> But \"man git-remote-helpers\" does work.\n>\n> It turns out that \"builtin/help.c\" maps its argument to a page by\n> prepending \"git-\" if given the name of a Git command and \"git\"\n> otherwise.\n>\n> Does this mean that \"git-remote-helpers.txt\" should lose the first\n> hyphen or is help.c not being clever enough in some way?\n\nI think it is the former. \"git help tutorial\" works exactly the\nsame way.\n"},{"id":"208402","messageId":"fc96ae61bb64ce19e856d7a1624e2130c99afd47.1359662569.git.john@keeping.me.uk","threadId":"32784","inReplyTo":"7vfw1ijtz2.fsf@alter.siamese.dyndns.org","subject":"[PATCH] gitremote-helpers.txt: rename from git-remote-helpers.txt","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2013-01-31T20:08:14Z","receivedAt":"2013-01-31T20:08:14Z","isPatch":true,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"When looking up a topic via \"git help \", git-help prepends \"git-\"\nto topics that are the names of commands (either builtin or found on the\npath) and \"git\" (no hyphen) to any other topic name.\n\n\"git-remote-helpers\" is not the name of a command, so \"git help\nremote-helpers\" looks for \"gitremote-helpers\" and does not find it.\n\nFix this by renaming \"git-remote-helpers.txt\" to\n\"gitremote-helpers.txt\".\n\nSigned-off-by: John Keeping \n---\nOn Wed, Jan 30, 2013 at 12:28:49PM -0800, Junio C Hamano wrote:\n> John Keeping writes:\n> >\n> > Does this mean that \"git-remote-helpers.txt\" should lose the first\n> > hyphen or is help.c not being clever enough in some way?\n> \n> I think it is the former. \"git help tutorial\" works exactly the\n> same way.\n\nThis is the patch to rename it to \"gitremote-helpers.txt\".\n\nWould we want to do something to avoid breaking links to the existing\ndocument as well?\n\n Documentation/git-remote-testgit.txt | 2 +-\n Documentation/{git-remote-helpers.txt => gitremote-helpers.txt} | 6 +++---\n Documentation/urls.txt | 2 +-\n 3 files changed, 5 insertions(+), 5 deletions(-)\n rename Documentation/{git-remote-helpers.txt => gitremote-helpers.txt} (99%)\n\ndiff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt\nindex 612a625..f791d73 100644\n--- a/Documentation/git-remote-testgit.txt\n+++ b/Documentation/git-remote-testgit.txt\n@@ -23,7 +23,7 @@ The best way to learn more is to read the comments and source code in\n \n SEE ALSO\n --------\n-linkgit:git-remote-helpers[1]\n+linkgit:gitremote-helpers[1]\n \n GIT\n ---\ndiff --git a/Documentation/git-remote-helpers.txt b/Documentation/gitremote-helpers.txt\nsimilarity index 99%\nrename from Documentation/git-remote-helpers.txt\nrename to Documentation/gitremote-helpers.txt\nindex e36fdcb..0c91aba 100644\n--- a/Documentation/git-remote-helpers.txt\n+++ b/Documentation/gitremote-helpers.txt\n@@ -1,9 +1,9 @@\n-git-remote-helpers(1)\n-=====================\n+gitremote-helpers(1)\n+====================\n \n NAME\n ----\n-git-remote-helpers - Helper programs to interact with remote repositories\n+gitremote-helpers - Helper programs to interact with remote repositories\n \n SYNOPSIS\n --------\ndiff --git a/Documentation/urls.txt b/Documentation/urls.txt\nindex 539c0a0..3ca122f 100644\n--- a/Documentation/urls.txt\n+++ b/Documentation/urls.txt\n@@ -55,7 +55,7 @@ may be used:\n \n where
may be a path, a server and path, or an arbitrary\n URL-like string recognized by the specific remote helper being\n-invoked. See linkgit:git-remote-helpers[1] for details.\n+invoked. See linkgit:gitremote-helpers[1] for details.\n \n If there are a large number of similarly-named remote repositories and\n you want to use a different format for them (such that the URLs you\n-- \n1.8.1.1\n"},{"id":"208403","messageId":"vpqpq0lw1ge.fsf@grenoble-inp.fr","threadId":"32784","inReplyTo":"fc96ae61bb64ce19e856d7a1624e2130c99afd47.1359662569.git.john@keeping.me.uk","subject":"Re: [PATCH] gitremote-helpers.txt: rename from git-remote-helpers.txt","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-01-31T20:18:41Z","receivedAt":"2013-01-31T20:18:41Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"John Keeping writes:\n\n> Would we want to do something to avoid breaking links to the existing\n> document as well?\n\nThat would be nice to add a new git-remote-helpers.txt saying \"document\nhas moved, see linkgit:gitremote-helpers.txt[1], so that HTML links to\nhttp://git-scm.com/docs/git-remote-helpers and friends do not get\nbroken, yes.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"208405","messageId":"7v1ud1gke7.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"vpqpq0lw1ge.fsf@grenoble-inp.fr","subject":"Re: [PATCH] gitremote-helpers.txt: rename from git-remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-31T20:36:16Z","receivedAt":"2013-01-31T20:36:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> John Keeping writes:\n>\n>> Would we want to do something to avoid breaking links to the existing\n>> document as well?\n>\n> That would be nice to add a new git-remote-helpers.txt saying \"document\n> has moved, see linkgit:gitremote-helpers.txt[1], so that HTML links to\n> http://git-scm.com/docs/git-remote-helpers and friends do not get\n> broken, yes.\n\nYeah, John's patch fixes internal links, but this will make links\nfrom other sites stale. Adding to our installation rule to put a\nhandcrafted HTML page that says \"The document moved here; please let\nthe owners of the referring site to know so that they can update the\nlink you clicked to get here\" would be appropriate, I think.\n"},{"id":"208412","messageId":"3f26b82599aa2a45897d345c851fab4751c55810.1359669205.git.john@keeping.me.uk","threadId":"32784","inReplyTo":"7v1ud1gke7.fsf@alter.siamese.dyndns.org","subject":"[PATCH] Rename {git- => git}remote-helpers.txt","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2013-01-31T21:59:50Z","receivedAt":"2013-01-31T21:59:50Z","isPatch":true,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"When looking up a topic via \"git help \", git-help prepends \"git-\"\nto topics that are the names of commands (either builtin or found on the\npath) and \"git\" (no hyphen) to any other topic name.\n\n\"git-remote-helpers\" is not the name of a command, so \"git help\nremote-helpers\" looks for \"gitremote-helpers\" and does not find it.\n\nFix this by renaming \"git-remote-helpers.txt\" to\n\"gitremote-helpers.txt\".\n\nSigned-off-by: John Keeping \n\n---\nChanges since v1:\n\n- add gitremote-helpers.txt to the Makefile since it is no longer caught\n by git-*.txt.\n\n- add a simple git-remote-helpers.html to help people following links to\n the old name.\n\n Documentation/.gitignore | 1 +\n Documentation/Makefile | 4 +-\n Documentation/git-remote-helpers.html | 55 ++++++++++++++++++++++\n Documentation/git-remote-testgit.txt | 2 +-\n ...it-remote-helpers.txt => gitremote-helpers.txt} | 6 +--\n Documentation/urls.txt | 2 +-\n 6 files changed, 63 insertions(+), 7 deletions(-)\n create mode 100644 Documentation/git-remote-helpers.html\n rename Documentation/{git-remote-helpers.txt => gitremote-helpers.txt} (99%)\n\ndiff --git a/Documentation/.gitignore b/Documentation/.gitignore\nindex 2c8b2d6..5f479b8 100644\n--- a/Documentation/.gitignore\n+++ b/Documentation/.gitignore\n@@ -1,5 +1,6 @@\n *.xml\n *.html\n+!git-remote-helpers.html\n *.[1-8]\n *.made\n *.texi\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex fe6709c..4ccb828 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,7 +1,7 @@\n MAN1_TXT= \\\n \t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n \t\t$(wildcard git-*.txt)) \\\n-\tgitk.txt gitweb.txt git.txt\n+\tgitk.txt gitweb.txt git.txt gitremote-helpers.txt\n MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \\\n \tgitrepository-layout.txt gitweb.conf.txt\n MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \\\n@@ -13,7 +13,7 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))\n \n-DOC_HTML=$(MAN_HTML)\n+DOC_HTML=$(MAN_HTML) git-remote-helpers.html\n \n ARTICLES = howto-index\n ARTICLES += everyday\ndiff --git a/Documentation/git-remote-helpers.html b/Documentation/git-remote-helpers.html\nnew file mode 100644\nindex 0000000..0c5ec27\n--- /dev/null\n+++ b/Documentation/git-remote-helpers.html\n@@ -0,0 +1,55 @@\n+\n+\n+\n+\n+git-remote-helpers(1) - Document Moved\n+\n+\n+\n+
\n+

\n+Document Moved\n+

\n+
\n+\n+

This document is now called gitremote-helpers.

\n+\n+

Please let the owners of the referring site know so that they can update the\n+link you clicked to get here.

\n+\n+\n+\ndiff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt\nindex 612a625..f791d73 100644\n--- a/Documentation/git-remote-testgit.txt\n+++ b/Documentation/git-remote-testgit.txt\n@@ -23,7 +23,7 @@ The best way to learn more is to read the comments and source code in\n \n SEE ALSO\n --------\n-linkgit:git-remote-helpers[1]\n+linkgit:gitremote-helpers[1]\n \n GIT\n ---\ndiff --git a/Documentation/git-remote-helpers.txt b/Documentation/gitremote-helpers.txt\nsimilarity index 99%\nrename from Documentation/git-remote-helpers.txt\nrename to Documentation/gitremote-helpers.txt\nindex e36fdcb..0c91aba 100644\n--- a/Documentation/git-remote-helpers.txt\n+++ b/Documentation/gitremote-helpers.txt\n@@ -1,9 +1,9 @@\n-git-remote-helpers(1)\n-=====================\n+gitremote-helpers(1)\n+====================\n \n NAME\n ----\n-git-remote-helpers - Helper programs to interact with remote repositories\n+gitremote-helpers - Helper programs to interact with remote repositories\n \n SYNOPSIS\n --------\ndiff --git a/Documentation/urls.txt b/Documentation/urls.txt\nindex 539c0a0..3ca122f 100644\n--- a/Documentation/urls.txt\n+++ b/Documentation/urls.txt\n@@ -55,7 +55,7 @@ may be used:\n \n where
may be a path, a server and path, or an arbitrary\n URL-like string recognized by the specific remote helper being\n-invoked. See linkgit:git-remote-helpers[1] for details.\n+invoked. See linkgit:gitremote-helpers[1] for details.\n \n If there are a large number of similarly-named remote repositories and\n you want to use a different format for them (such that the URLs you\n-- \n1.8.1.1\n"},{"id":"208414","messageId":"7vy5f9dmrt.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"3f26b82599aa2a45897d345c851fab4751c55810.1359669205.git.john@keeping.me.uk","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-31T22:13:10Z","receivedAt":"2013-01-31T22:13:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"John Keeping writes:\n\n> When looking up a topic via \"git help \", git-help prepends \"git-\"\n> to topics that are the names of commands (either builtin or found on the\n> path) and \"git\" (no hyphen) to any other topic name.\n>\n> \"git-remote-helpers\" is not the name of a command, so \"git help\n> remote-helpers\" looks for \"gitremote-helpers\" and does not find it.\n>\n> Fix this by renaming \"git-remote-helpers.txt\" to\n> \"gitremote-helpers.txt\".\n>\n> Signed-off-by: John Keeping \n>\n> ---\n> Changes since v1:\n>\n> - add gitremote-helpers.txt to the Makefile since it is no longer caught\n> by git-*.txt.\n>\n> - add a simple git-remote-helpers.html to help people following links to\n> the old name.\n\nDoesn't \"make clean\" remove the placeholder file?\n\n> Documentation/.gitignore | 1 +\n> Documentation/Makefile | 4 +-\n> Documentation/git-remote-helpers.html | 55 ++++++++++++++++++++++\n> Documentation/git-remote-testgit.txt | 2 +-\n> ...it-remote-helpers.txt => gitremote-helpers.txt} | 6 +--\n> Documentation/urls.txt | 2 +-\n> 6 files changed, 63 insertions(+), 7 deletions(-)\n> create mode 100644 Documentation/git-remote-helpers.html\n> rename Documentation/{git-remote-helpers.txt => gitremote-helpers.txt} (99%)\n>\n> diff --git a/Documentation/.gitignore b/Documentation/.gitignore\n> index 2c8b2d6..5f479b8 100644\n> --- a/Documentation/.gitignore\n> +++ b/Documentation/.gitignore\n> @@ -1,5 +1,6 @@\n> *.xml\n> *.html\n> +!git-remote-helpers.html\n> *.[1-8]\n> *.made\n> *.texi\n> diff --git a/Documentation/Makefile b/Documentation/Makefile\n> index fe6709c..4ccb828 100644\n> --- a/Documentation/Makefile\n> +++ b/Documentation/Makefile\n> @@ -1,7 +1,7 @@\n> MAN1_TXT= \\\n> \t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n> \t\t$(wildcard git-*.txt)) \\\n> -\tgitk.txt gitweb.txt git.txt\n> +\tgitk.txt gitweb.txt git.txt gitremote-helpers.txt\n> MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \\\n> \tgitrepository-layout.txt gitweb.conf.txt\n> MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \\\n> @@ -13,7 +13,7 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n> MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n> MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))\n> \n> -DOC_HTML=$(MAN_HTML)\n> +DOC_HTML=$(MAN_HTML) git-remote-helpers.html\n> \n> ARTICLES = howto-index\n> ARTICLES += everyday\n> diff --git a/Documentation/git-remote-helpers.html b/Documentation/git-remote-helpers.html\n> new file mode 100644\n> index 0000000..0c5ec27\n> --- /dev/null\n> +++ b/Documentation/git-remote-helpers.html\n> @@ -0,0 +1,55 @@\n> + + \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n> +\n> +\n> +\n> +git-remote-helpers(1) - Document Moved\n> +\n> +\n> +\n> +
\n> +

\n> +Document Moved\n> +

\n> +
\n> +\n> +

This document is now called +href=\"gitremote-helpers.html\">gitremote-helpers.

\n> +\n> +

Please let the owners of the referring site know so that they can update the\n> +link you clicked to get here.

\n> +\n> +\n> +\n> diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt\n> index 612a625..f791d73 100644\n> --- a/Documentation/git-remote-testgit.txt\n> +++ b/Documentation/git-remote-testgit.txt\n> @@ -23,7 +23,7 @@ The best way to learn more is to read the comments and source code in\n> \n> SEE ALSO\n> --------\n> -linkgit:git-remote-helpers[1]\n> +linkgit:gitremote-helpers[1]\n> \n> GIT\n> ---\n> diff --git a/Documentation/git-remote-helpers.txt b/Documentation/gitremote-helpers.txt\n> similarity index 99%\n> rename from Documentation/git-remote-helpers.txt\n> rename to Documentation/gitremote-helpers.txt\n> index e36fdcb..0c91aba 100644\n> --- a/Documentation/git-remote-helpers.txt\n> +++ b/Documentation/gitremote-helpers.txt\n> @@ -1,9 +1,9 @@\n> -git-remote-helpers(1)\n> -=====================\n> +gitremote-helpers(1)\n> +====================\n> \n> NAME\n> ----\n> -git-remote-helpers - Helper programs to interact with remote repositories\n> +gitremote-helpers - Helper programs to interact with remote repositories\n> \n> SYNOPSIS\n> --------\n> diff --git a/Documentation/urls.txt b/Documentation/urls.txt\n> index 539c0a0..3ca122f 100644\n> --- a/Documentation/urls.txt\n> +++ b/Documentation/urls.txt\n> @@ -55,7 +55,7 @@ may be used:\n> \n> where
may be a path, a server and path, or an arbitrary\n> URL-like string recognized by the specific remote helper being\n> -invoked. See linkgit:git-remote-helpers[1] for details.\n> +invoked. See linkgit:gitremote-helpers[1] for details.\n> \n> If there are a large number of similarly-named remote repositories and\n> you want to use a different format for them (such that the URLs you\n"},{"id":"208415","messageId":"1359671290-ner-7089@calvin","threadId":"32784","inReplyTo":"fc96ae61bb64ce19e856d7a1624e2130c99afd47.1359662569.git.john@keeping.me.uk","subject":"Re: [PATCH] gitremote-helpers.txt: rename from git-remote-helpers.txt","fromName":"Tomas Carnecky","fromEmail":"tomas.carnecky@gmail.com","sentAt":"2013-01-31T22:28:10Z","receivedAt":"2013-01-31T22:28:10Z","isPatch":true,"sender":{"key":"tomas.carnecky@gmail.com","avatar":null},"body":"On Thu, 31 Jan 2013 20:08:14 +0000, John Keeping wrote:\n> This is the patch to rename it to \"gitremote-helpers.txt\".\n> \n> Documentation/{git-remote-helpers.txt => gitremote-helpers.txt} | 6 +++---\n\nIt feels somewhat weird to have 'git-remote' but 'gitremote-helpers'.\n"},{"id":"208416","messageId":"20130131222817.GP1342@serenity.lan","threadId":"32784","inReplyTo":"7vy5f9dmrt.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2013-01-31T22:28:17Z","receivedAt":"2013-01-31T22:28:17Z","isPatch":true,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"On Thu, Jan 31, 2013 at 02:13:10PM -0800, Junio C Hamano wrote:\n> John Keeping writes:\n> \n> > When looking up a topic via \"git help \", git-help prepends \"git-\"\n> > to topics that are the names of commands (either builtin or found on the\n> > path) and \"git\" (no hyphen) to any other topic name.\n> >\n> > \"git-remote-helpers\" is not the name of a command, so \"git help\n> > remote-helpers\" looks for \"gitremote-helpers\" and does not find it.\n> >\n> > Fix this by renaming \"git-remote-helpers.txt\" to\n> > \"gitremote-helpers.txt\".\n> >\n> > Signed-off-by: John Keeping \n> >\n> > ---\n> > Changes since v1:\n> >\n> > - add gitremote-helpers.txt to the Makefile since it is no longer caught\n> > by git-*.txt.\n> >\n> > - add a simple git-remote-helpers.html to help people following links to\n> > the old name.\n> \n> Doesn't \"make clean\" remove the placeholder file?\n\nYes. Should I change it to \"git-remote-helpers.html.in\" and then copy\nit into place? That seems like the simplest answer and means that\n\"*.html\" will continue to refer only to generated files.\n\n\nJohn\n"},{"id":"208417","messageId":"20130131223305.GB21729@sigill.intra.peff.net","threadId":"32784","inReplyTo":"3f26b82599aa2a45897d345c851fab4751c55810.1359669205.git.john@keeping.me.uk","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-01-31T22:33:05Z","receivedAt":"2013-01-31T22:33:05Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 31, 2013 at 09:59:50PM +0000, John Keeping wrote:\n\n> When looking up a topic via \"git help \", git-help prepends \"git-\"\n> to topics that are the names of commands (either builtin or found on the\n> path) and \"git\" (no hyphen) to any other topic name.\n> \n> \"git-remote-helpers\" is not the name of a command, so \"git help\n> remote-helpers\" looks for \"gitremote-helpers\" and does not find it.\n> \n> Fix this by renaming \"git-remote-helpers.txt\" to\n> \"gitremote-helpers.txt\".\n\nMaybe it is just me, but the fact that accessing the manpage is now:\n\n man gitremote-helpers\n\nfeels weird to me. I know it technically follows our syntactic rules,\nbut having the lack of dash be significant between \"git\" and \"remote\",\nbut then having a dash later makes it hard on the eyes.\n\nWould it make more sense to just call it \"gitremotehelpers\", and then\naccess it as:\n\n git help remotehelpers\n\nor\n\n man gitremotehelpers\n\n?\n\nThat has it its own ugliness (two words run together), but at least my\nversion of man will accept arbitrary capitalization, allowing:\n\n git help remoteHelpers\n\nand\n\n man gitremoteHelpers\n\nI dunno.\n\n-Peff\n"},{"id":"208421","messageId":"7vtxpxdldj.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130131222817.GP1342@serenity.lan","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-31T22:43:20Z","receivedAt":"2013-01-31T22:43:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"John Keeping writes:\n\n> Yes. Should I change it to \"git-remote-helpers.html.in\" and then copy\n> it into place? That seems like the simplest answer and means that\n> \"*.html\" will continue to refer only to generated files.\n\nI'd like to see if we can have a way to keep its look as the default\ncss gets updated without maintainance burden.\n\nHow about using AsciiDoc instead of \"cp\", perhaps like this on top\nof your patch?\n\n Documentation/.gitignore | 1 -\n Documentation/Makefile | 9 +++++-\n Documentation/git-remote-helpers.txto | 26 +++++++++++++++++\n Documentation/git-remote-helpers.html | 55 -----------------------------------\n 4 files changed, 34 insertions(+), 57 deletions(-)\n\ndiff --git a/Documentation/.gitignore b/Documentation/.gitignore\nindex 4685378..d62aebd 100644\n--- a/Documentation/.gitignore\n+++ b/Documentation/.gitignore\n@@ -1,6 +1,5 @@\n *.xml\n *.html\n-!git-remote-helpers.html\n *.[1-8]\n *.made\n *.texi\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 13e0098..fa2f9f9 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -13,7 +13,8 @@ MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT))\n \n-DOC_HTML=$(MAN_HTML) git-remote-helpers.html\n+OBSOLETE_HTML = git-remote-helpers.html\n+DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML)\n \n ARTICLES = howto-index\n ARTICLES += everyday\n@@ -261,6 +262,12 @@ $(MAN_HTML): %.html : %.txt asciidoc.conf\n \t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \\\n \tmv $@+ $@\n \n+$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf\n+\t$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \\\n+\t$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \\\n+\t\t$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \\\n+\tmv $@+ $@\n+\n manpage-base-url.xsl: manpage-base-url.xsl.in\n \tsed \"s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|\" $< > $@\n \ndiff --git a/Documentation/git-remote-helpers.txto b/Documentation/git-remote-helpers.txto\nnew file mode 100644\nindex 0000000..a966013\n--- /dev/null\n+++ b/Documentation/git-remote-helpers.txto\n@@ -0,0 +1,25 @@\n+git-remote-helpers(1)\n+=====================\n+\n+NAME\n+----\n+git-remote-helpers - obsoleted page\n+\n+SYNOPSIS\n+--------\n+See linkgit:gitremote-helpers[1].\n+\n+DESCRIPTION\n+-----------\n+This document has been moved to linkgit:gitremote-helpers[1].\n+\n+Please let the owners of the referring site know so that they can update the\n+link you clicked to get here.\n+\n+SEE ALSO\n+--------\n+linkgit:gitremote-helpers[1]\n+\n+GIT\n+---\n+No longer a part of the linkgit:git[1] suite\ndiff --git a/Documentation/git-remote-helpers.html b/Documentation/git-remote-helpers.html\ndeleted file mode 100644\nindex 0c5ec27..0000000\n--- a/Documentation/git-remote-helpers.html\n+++ /dev/null\n@@ -1,55 +0,0 @@\n-\n-\n-\n-\n-git-remote-helpers(1) - Document Moved\n-\n-\n-\n-
\n-

\n-Document Moved\n-

\n-
\n-\n-

This document is now called gitremote-helpers.

\n-\n-

Please let the owners of the referring site know so that they can update the\n-link you clicked to get here.

\n-\n-\n-\n"},{"id":"208422","messageId":"7vpq0ldlaf.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"1359671290-ner-7089@calvin","subject":"Re: [PATCH] gitremote-helpers.txt: rename from git-remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-31T22:45:12Z","receivedAt":"2013-01-31T22:45:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Tomas Carnecky writes:\n\n> On Thu, 31 Jan 2013 20:08:14 +0000, John Keeping wrote:\n>> This is the patch to rename it to \"gitremote-helpers.txt\".\n>> \n>> Documentation/{git-remote-helpers.txt => gitremote-helpers.txt} | 6 +++---\n>\n> It feels somewhat weird to have 'git-remote' but 'gitremote-helpers'.\n\nBut the remote helpers are not helpers to \"git remote\" (which is\nessentially a glorified wrapper around \"git config -l remote.*\").\n"},{"id":"208423","messageId":"7vlib9dl4l.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130131223305.GB21729@sigill.intra.peff.net","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-31T22:48:42Z","receivedAt":"2013-01-31T22:48:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> Maybe it is just me, but the fact that accessing the manpage is now:\n>\n> man gitremote-helpers\n>\n> feels weird to me.\n\nIt feels equally weird to say \"man gitremotehelpers\" (or in general\n\"man git-thing\" or \"man gitconcept\"), to me. I gave up and switched\nto \"git help remote-helpers\" some time ago. \"git help remotehelpers\"\nfeels like a small regression.\n\n> I dunno.\n\nMe neither.\n"},{"id":"208424","messageId":"20130131225620.GQ1342@serenity.lan","threadId":"32784","inReplyTo":"7vtxpxdldj.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2013-01-31T22:56:20Z","receivedAt":"2013-01-31T22:56:20Z","isPatch":true,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"On Thu, Jan 31, 2013 at 02:43:20PM -0800, Junio C Hamano wrote:\n> John Keeping writes:\n> \n> > Yes. Should I change it to \"git-remote-helpers.html.in\" and then copy\n> > it into place? That seems like the simplest answer and means that\n> > \"*.html\" will continue to refer only to generated files.\n> \n> I'd like to see if we can have a way to keep its look as the default\n> css gets updated without maintainance burden.\n> \n> How about using AsciiDoc instead of \"cp\", perhaps like this on top\n> of your patch?\n\nI tried AsciiDoc first but didn't like the output. I think putting \"See\ngitremote-helpers\" in the synopsis is the magic I was missing. This\nlooks good to me.\n\n\nJohn\n"},{"id":"208425","messageId":"20130131230455.GN27340@google.com","threadId":"32784","inReplyTo":"20130131223305.GB21729@sigill.intra.peff.net","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-01-31T23:04:55Z","receivedAt":"2013-01-31T23:04:55Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jeff King wrote:\n\n> Maybe it is just me, but the fact that accessing the manpage is now:\n>\n> man gitremote-helpers\n>\n> feels weird to me. I know it technically follows our syntactic rules,\n> but having the lack of dash be significant between \"git\" and \"remote\",\n> but then having a dash later makes it hard on the eyes.\n\nYes. I have thought for years that it should be git-remote-helpers,\nthat \"git help\" should be tweaked to look for that, and that the\nexisting gitrepository-layout and friends should be replaced with\nredirects.\n\nI didn't say anything (except a random comment once on #git) because I\ncan't promise to have time soon to work on it. Might try anyway.\n\nThanks,\nJonathan\n"},{"id":"208426","messageId":"7vhalxdk2q.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130131230455.GN27340@google.com","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-31T23:11:25Z","receivedAt":"2013-01-31T23:11:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Jeff King wrote:\n>\n>> Maybe it is just me, but the fact that accessing the manpage is now:\n>>\n>> man gitremote-helpers\n>>\n>> feels weird to me. I know it technically follows our syntactic rules,\n>> but having the lack of dash be significant between \"git\" and \"remote\",\n>> but then having a dash later makes it hard on the eyes.\n>\n> Yes. I have thought for years that it should be git-remote-helpers,\n> that \"git help\" should be tweaked to look for that, and that the\n> existing gitrepository-layout and friends should be replaced with\n> redirects.\n\nBecause of the \"git help\" look up rules, we cannot have two pages\nthat only differ at the dash (or absense of it) immediately after\n'git'; e.g. one about the concept of 'frotz' in the context of Git,\ni.e. \"man gitfrotz\", and the other about the subcommand to perform\n'frotz', i.e. \"man git-frotz\". The way to refer to these two pages\nare both \"git help frotz\".\n\nThe simplest way forward may be to teach \"git help\" to try both\npaths? But some people configure \"git help -w\" to refer to remote\nsite, so it won't be access(path, F_OK). Sigh...\n"},{"id":"208427","messageId":"20130131231341.GO27340@google.com","threadId":"32784","inReplyTo":"7vhalxdk2q.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-01-31T23:13:41Z","receivedAt":"2013-01-31T23:13:41Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n> Jonathan Nieder writes:\n\n>> Yes. I have thought for years that it should be git-remote-helpers,\n>> that \"git help\" should be tweaked to look for that, and that the\n>> existing gitrepository-layout and friends should be replaced with\n>> redirects.\n>\n> Because of the \"git help\" look up rules, we cannot have two pages\n> that only differ at the dash (or absense of it) immediately after\n> 'git'; e.g. one about the concept of 'frotz' in the context of Git,\n> i.e. \"man gitfrotz\", and the other about the subcommand to perform\n> 'frotz', i.e. \"man git-frotz\". The way to refer to these two pages\n> are both \"git help frotz\".\n\nExactly. Hence the disambiguating dash-versus-nondash convention buys\nus nothing.\n"},{"id":"208428","messageId":"7vd2wkewvb.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130131225620.GQ1342@serenity.lan","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-31T23:49:44Z","receivedAt":"2013-01-31T23:49:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"John Keeping writes:\n\n> On Thu, Jan 31, 2013 at 02:43:20PM -0800, Junio C Hamano wrote:\n>> John Keeping writes:\n>> \n>> > Yes. Should I change it to \"git-remote-helpers.html.in\" and then copy\n>> > it into place? That seems like the simplest answer and means that\n>> > \"*.html\" will continue to refer only to generated files.\n>> \n>> I'd like to see if we can have a way to keep its look as the default\n>> css gets updated without maintainance burden.\n>> \n>> How about using AsciiDoc instead of \"cp\", perhaps like this on top\n>> of your patch?\n>\n> I tried AsciiDoc first but didn't like the output. I think putting \"See\n> gitremote-helpers\" in the synopsis is the magic I was missing. This\n> looks good to me.\n\nActually I didn't mean \"take this patch, it works\". I've queued a\nslightly different version and will push it out as part of 'pu'\nlater.\n\nThanks.\n"},{"id":"208442","messageId":"20130201050343.GA29973@sigill.intra.peff.net","threadId":"32784","inReplyTo":"20130131230455.GN27340@google.com","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T05:03:43Z","receivedAt":"2013-02-01T05:03:43Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 31, 2013 at 03:04:55PM -0800, Jonathan Nieder wrote:\n\n> Jeff King wrote:\n> \n> > Maybe it is just me, but the fact that accessing the manpage is now:\n> >\n> > man gitremote-helpers\n> >\n> > feels weird to me. I know it technically follows our syntactic rules,\n> > but having the lack of dash be significant between \"git\" and \"remote\",\n> > but then having a dash later makes it hard on the eyes.\n> \n> Yes. I have thought for years that it should be git-remote-helpers,\n> that \"git help\" should be tweaked to look for that, and that the\n> existing gitrepository-layout and friends should be replaced with\n> redirects.\n\nWhat was the original rationale for the \"gitfoo\" form? Was it just to\nvisually distinguish command manpages from non-command manpages? I can't\nremember the origins now. It does seem like it is causing more\nhassle than it is worth, but maybe there is something I am forgetting.\n\n-Peff\n"},{"id":"208444","messageId":"7v7gmsd26o.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130201050343.GA29973@sigill.intra.peff.net","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-01T05:37:51Z","receivedAt":"2013-02-01T05:37:51Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> What was the original rationale for the \"gitfoo\" form? Was it just to\n> visually distinguish command manpages from non-command manpages? I can't\n> remember the origins now.\n\nb27a23e (Documentation: convert tutorials to man pages, 2008-05-24)\nturns \"tutorial.txt\" into \"gittutorial.txt\". Before that, there\nwere git{attributes,cli,ignore,hooks,modules}.txt. They were added\nin this order, which reveals the true reason:\n\n hooks.txt\n gitignore.txt\n gitmodules.txt\n gitcli.txt\n hooks.txt => githooks.txt\n gitatributes.txt\n\nOriginally, we did not intend to name them as \"git$concept.txt\";\ninstead, we just said \"$concept.txt\". Hooks are \"hooks\", and we\nknow we are discussing hooks in the context of Git, there was no\nreason to say \"githooks\". \"gitignore\" was about the file format,\nand it would have been insane to call it \"ignore.txt\". The same\napplies to \"gitmodules.txt\".\n\nThings start to go in a strange direction when \"cli\" was added. We\nknow that is about the command line interface in the context of Git,\nand it should have been \"cli.txt\". To make things worse, later\n\"hooks.txt\" took an example of \"gitcli.txt\" in the wrong way at\na5af0e2 (Documentation: rename \"hooks.txt\" to \"githooks.txt\" and\nmake it a man page, 2008-05-02).\n\nIn other way, I think this wasn't designed, but organically grown.\n"},{"id":"208451","messageId":"20130201073352.GB970@sigill.intra.peff.net","threadId":"32784","inReplyTo":"7v7gmsd26o.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T07:33:52Z","receivedAt":"2013-02-01T07:33:52Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Jan 31, 2013 at 09:37:51PM -0800, Junio C Hamano wrote:\n\n> Jeff King writes:\n> \n> > What was the original rationale for the \"gitfoo\" form? Was it just to\n> > visually distinguish command manpages from non-command manpages? I can't\n> > remember the origins now.\n> \n> b27a23e (Documentation: convert tutorials to man pages, 2008-05-24)\n> turns \"tutorial.txt\" into \"gittutorial.txt\". Before that, there\n> were git{attributes,cli,ignore,hooks,modules}.txt. They were added\n> in this order, which reveals the true reason:\n> \n> hooks.txt\n> gitignore.txt\n> gitmodules.txt\n> gitcli.txt\n> hooks.txt => githooks.txt\n> gitatributes.txt\n> \n> Originally, we did not intend to name them as \"git$concept.txt\";\n> instead, we just said \"$concept.txt\". Hooks are \"hooks\", and we\n> know we are discussing hooks in the context of Git, there was no\n> reason to say \"githooks\".\n\nYes, but if we are going to install a manpage, we must include \"git\"\nsomewhere in the name since that context is lost in the global manpage\ndatabase. So we need \"githooks.txt\" or \"git-hooks.txt\".\n\n> \"gitignore\" was about the file format,\n> and it would have been insane to call it \"ignore.txt\". The same\n> applies to \"gitmodules.txt\".\n\nRight. So we have some that must be \"gitfoo\", and others that do not\ncare. If we turned \"githooks\" into \"git-hooks\" and removed the \"is it a\ncommand?\" magic from \"git help\", then \"git help hooks\" would still find\nhooks. And likewise, \"git help gitignore\" would still find \"gitignore\".\nBut you could no longer say \"git help ignore\" to find \"gitignore\".\n\nWhich personally I am OK with. It is not a sensible thing to ask for;\nthe concept is not \"ignore\", but rather \"the gitignore file\".\n\n> In other way, I think this wasn't designed, but organically grown.\n\nLike many parts of git. :) I am starting to think it has grown in an\nunnecessarily complex direction, and we would be much happier just\ncalling all of the \"concept\" documentation \"git-\".\n\nThe steps I see are:\n\n 1. Modify builtin/help.c, like:\n\ndiff --git a/builtin/help.c b/builtin/help.c\nindex 6067a61..1eca4ea 100644\n--- a/builtin/help.c\n+++ b/builtin/help.c\n@@ -308,10 +308,8 @@ static const char *cmd_to_page(const char *git_cmd)\n \t\treturn \"git\";\n \telse if (!prefixcmp(git_cmd, \"git\"))\n \t\treturn git_cmd;\n-\telse if (is_git_command(git_cmd))\n-\t\treturn prepend(\"git-\", git_cmd);\n \telse\n-\t\treturn prepend(\"git\", git_cmd);\n+\t\treturn prepend(\"git-\", git_cmd);\n }\n \n static void setup_man_path(void)\n\n\n 2. Rename the \"concept\" files like:\n\n Documentation/{gitcli.txt => git-cli.txt} | 0\n Documentation/{gitcore-tutorial.txt => git-core-tutorial.txt} | 0\n Documentation/{gitcredentials.txt => git-credentials.txt} | 0\n Documentation/{gitcvs-migration.txt => git-cvs-migration.txt} | 0\n Documentation/{gitdiffcore.txt => git-diffcore.txt} | 0\n Documentation/{gitglossary.txt => git-glossary.txt} | 0\n Documentation/{githooks.txt => git-hooks.txt} | 0\n Documentation/{gitnamespaces.txt => git-namespaces.txt} | 0\n Documentation/{gitrepository-layout.txt => git-repository-layout.txt} | 0\n Documentation/{gitrevisions.txt => git-revisions.txt} | 0\n Documentation/{gittutorial-2.txt => git-tutorial-2.txt} | 0\n Documentation/{gittutorial.txt => git-tutorial.txt} | 0\n Documentation/{gitworkflows.txt => git-workflows.txt} | 0\n\n\n 3. Teach Documentation/Makefile about the new filenames. MAN1_TXT\n includes git-*.txt, which is no longer right. I think we'd need to\n just filter out what is in MAN5_TXT and MAN7_TXT.\n\n 4. Replace the rename \"gitfoo\" above with a \"see git-foo...\" pointer.\n Users of \"git help foo\" would not ever see this, but people who\n have trained their fingers to type \"man gitfoo\" would, along with\n anybody following an outdated HTML link.\n\n 5. Update internal references to \"linkgit:gitfoo\" to point to\n \"git-foo\".\n\nHmm. That really does not seem so bad. The biggest downside is the\npeople who have to see the redirect made in step 4.\n\nBut I have not thought about it too hard, so maybe there is something\nelse I'm not seeing.\n\n-Peff\n"},{"id":"208452","messageId":"20130201082538.GA25674@sigill.intra.peff.net","threadId":"32784","inReplyTo":"20130201073352.GB970@sigill.intra.peff.net","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T08:25:38Z","receivedAt":"2013-02-01T08:25:38Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Feb 01, 2013 at 02:33:52AM -0500, Jeff King wrote:\n\n> I am starting to think it has grown in an unnecessarily complex\n> direction, and we would be much happier just calling all of the\n> \"concept\" documentation \"git-\".\n> \n> The steps I see are:\n\nI am still undecided on whether it is a good idea (in some ways, I like\nthat \"gitrevisions\" signals to the user that it is not a command; but I\nalso recognize that it is more complex for users, and gitremote-helpers\nlooks silly to me). But here is what the patch looks like, for\nreference. The first one is a cleanup we might want to take anyway, and\nthe second one is the meat.\n\n [1/2]: Documentation/Makefile: clean up MAN*_TXT lists\n [2/2]: docs: convert \"concept\" manpages to git-*\n\n-Peff\n"},{"id":"208453","messageId":"20130201082650.GA25783@sigill.intra.peff.net","threadId":"32784","inReplyTo":"20130201082538.GA25674@sigill.intra.peff.net","subject":"[PATCH 1/2] Documentation/Makefile: clean up MAN*_TXT lists","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T08:26:51Z","receivedAt":"2013-02-01T08:26:51Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"We keep a list of the various files that end up as man1,\nman5, etc. Let's break these single-line lists into sorted\nmulti-line lists, which makes diffs that touch them much\neasier to read.\n\nSigned-off-by: Jeff King \n---\n Documentation/Makefile | 33 ++++++++++++++++++++++++---------\n 1 file changed, 24 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 971977b..8e7939f 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,13 +1,28 @@ MAN7_TXT += gitcredentials.txt\n-MAN1_TXT= \\\n-\t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n-\t\t$(wildcard git-*.txt)) \\\n-\tgitk.txt gitweb.txt git.txt\n-MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \\\n-\tgitrepository-layout.txt gitweb.conf.txt\n-MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \\\n-\tgitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \\\n-\tgitdiffcore.txt gitnamespaces.txt gitrevisions.txt gitworkflows.txt\n+MAN1_TXT += $(filter-out \\\n+\t\t$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n+\t\t$(wildcard git-*.txt))\n+MAN1_TXT += git.txt\n+MAN1_TXT += gitk.txt\n+MAN1_TXT += gitweb.txt\n+\n+MAN5_TXT += gitattributes.txt\n+MAN5_TXT += githooks.txt\n+MAN5_TXT += gitignore.txt\n+MAN5_TXT += gitmodules.txt\n+MAN5_TXT += gitrepository-layout.txt\n+MAN5_TXT += gitweb.conf.txt\n+\n+MAN7_TXT += gitcli.txt\n+MAN7_TXT += gitcore-tutorial.txt\n MAN7_TXT += gitcredentials.txt\n+MAN7_TXT += gitcvs-migration.txt\n+MAN7_TXT += gitdiffcore.txt\n+MAN7_TXT += gitglossary.txt\n+MAN7_TXT += gitnamespaces.txt\n+MAN7_TXT += gitrevisions.txt\n+MAN7_TXT += gittutorial-2.txt\n+MAN7_TXT += gittutorial.txt\n+MAN7_TXT += gitworkflows.txt\n \n MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n-- \n1.8.1.2.11.g1a2f572\n"},{"id":"208454","messageId":"20130201082744.GB25783@sigill.intra.peff.net","threadId":"32784","inReplyTo":"20130201082538.GA25674@sigill.intra.peff.net","subject":"[PATCH 2/2] docs: convert \"concept\" manpages to git-*","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T08:27:45Z","receivedAt":"2013-02-01T08:27:45Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"The manpages for commands have always been spelled\n\"git-cmd\". But \"concept\" manpages, like \"gitrevisions\" were\nspelled without the dash. This is complex, and does not\nactually buy anything. You might think it creates a separate\nnamespace for concepts and commands, but \"git help foo\" will\nprefer the command form, meaning we must avoid such\nconflicts anyway.\n\nLet's just call everything git-*, which is simpler. This\npatch renames the documentation files, updates the Makefile\nto find them, and updates internal linkgit references to the\npages. It updates builtin/help.c so that users of \"git help\nfoo\" will not even notice the difference.\n\nUsers of external html links, or users who have trained\ntheir fingers to type \"man gitfoo\" will notice the missing\npages. This patch does not install a \"this page has moved\"\nplaceholder, but that can easily be done on top.\n\nSigned-off-by: Jeff King \n---\n Documentation/Makefile | 27 +++++++++--------\n Documentation/config.txt | 8 ++---\n Documentation/diff-options.txt | 4 +--\n Documentation/git-cat-file.txt | 2 +-\n Documentation/git-check-ref-format.txt | 2 +-\n Documentation/git-cherry-pick.txt | 2 +-\n Documentation/{gitcli.txt => git-cli.txt} | 8 ++---\n Documentation/git-commit.txt | 4 +--\n ...{gitcore-tutorial.txt => git-core-tutorial.txt} | 20 ++++++-------\n Documentation/git-credential-cache.txt | 2 +-\n Documentation/git-credential-store.txt | 4 +--\n .../{gitcredentials.txt => git-credentials.txt} | 6 ++--\n ...{gitcvs-migration.txt => git-cvs-migration.txt} | 22 +++++++-------\n Documentation/git-cvsimport.txt | 2 +-\n Documentation/git-cvsserver.txt | 2 +-\n Documentation/git-diff.txt | 6 ++--\n .../{gitdiffcore.txt => git-diffcore.txt} | 6 ++--\n Documentation/git-fast-import.txt | 2 +-\n Documentation/git-format-patch.txt | 2 +-\n Documentation/git-gc.txt | 2 +-\n .../{gitglossary.txt => git-glossary.txt} | 12 ++++----\n Documentation/{githooks.txt => git-hooks.txt} | 6 ++--\n Documentation/git-http-backend.txt | 2 +-\n Documentation/git-log.txt | 2 +-\n .../{gitnamespaces.txt => git-namespaces.txt} | 6 ++--\n Documentation/git-push.txt | 2 +-\n Documentation/git-rebase.txt | 4 +--\n Documentation/git-receive-pack.txt | 2 +-\n Documentation/git-reflog.txt | 2 +-\n ...sitory-layout.txt => git-repository-layout.txt} | 10 +++----\n Documentation/git-rev-parse.txt | 2 +-\n Documentation/git-revert.txt | 2 +-\n .../{gitrevisions.txt => git-revisions.txt} | 6 ++--\n Documentation/git-show-branch.txt | 2 +-\n Documentation/git-show-ref.txt | 2 +-\n Documentation/git-show.txt | 2 +-\n .../{gittutorial-2.txt => git-tutorial-2.txt} | 24 +++++++--------\n .../{gittutorial.txt => git-tutorial.txt} | 24 +++++++--------\n Documentation/git-update-server-info.txt | 2 +-\n Documentation/git-upload-pack.txt | 2 +-\n .../{gitworkflows.txt => git-workflows.txt} | 8 ++---\n Documentation/git.txt | 35 +++++++++++-----------\n Documentation/gitignore.txt | 2 +-\n Documentation/gitk.txt | 2 +-\n Documentation/gitweb.conf.txt | 2 +-\n Documentation/technical/api-credentials.txt | 2 +-\n Documentation/user-manual.txt | 14 ++++-----\n builtin/help.c | 4 +--\n 48 files changed, 159 insertions(+), 159 deletions(-)\n rename Documentation/{gitcli.txt => git-cli.txt} (98%)\n rename Documentation/{gitcore-tutorial.txt => git-core-tutorial.txt} (99%)\n rename Documentation/{gitcredentials.txt => git-credentials.txt} (98%)\n rename Documentation/{gitcvs-migration.txt => git-cvs-migration.txt} (94%)\n rename Documentation/{gitdiffcore.txt => git-diffcore.txt} (99%)\n rename Documentation/{gitglossary.txt => git-glossary.txt} (61%)\n rename Documentation/{githooks.txt => git-hooks.txt} (99%)\n rename Documentation/{gitnamespaces.txt => git-namespaces.txt} (97%)\n rename Documentation/{gitrepository-layout.txt => git-repository-layout.txt} (97%)\n rename Documentation/{gitrevisions.txt => git-revisions.txt} (88%)\n rename Documentation/{gittutorial-2.txt => git-tutorial-2.txt} (96%)\n rename Documentation/{gittutorial.txt => git-tutorial.txt} (97%)\n rename Documentation/{gitworkflows.txt => git-workflows.txt} (99%)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 8e7939f..552cc37 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,28 +1,29 @@ MAN5_TXT += gitweb.conf.txt\n MAN1_TXT += $(filter-out \\\n+\t\t$(MAN5_TXT) $(MAN7_TXT) \\\n \t\t$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n \t\t$(wildcard git-*.txt))\n MAN1_TXT += git.txt\n MAN1_TXT += gitk.txt\n MAN1_TXT += gitweb.txt\n \n+MAN5_TXT += git-hooks.txt\n+MAN5_TXT += git-repository-layout.txt\n MAN5_TXT += gitattributes.txt\n-MAN5_TXT += githooks.txt\n MAN5_TXT += gitignore.txt\n MAN5_TXT += gitmodules.txt\n-MAN5_TXT += gitrepository-layout.txt\n MAN5_TXT += gitweb.conf.txt\n \n-MAN7_TXT += gitcli.txt\n-MAN7_TXT += gitcore-tutorial.txt\n-MAN7_TXT += gitcredentials.txt\n-MAN7_TXT += gitcvs-migration.txt\n-MAN7_TXT += gitdiffcore.txt\n-MAN7_TXT += gitglossary.txt\n-MAN7_TXT += gitnamespaces.txt\n-MAN7_TXT += gitrevisions.txt\n-MAN7_TXT += gittutorial-2.txt\n-MAN7_TXT += gittutorial.txt\n-MAN7_TXT += gitworkflows.txt\n+MAN7_TXT += git-cli.txt\n+MAN7_TXT += git-core-tutorial.txt\n+MAN7_TXT += git-credentials.txt\n+MAN7_TXT += git-cvs-migration.txt\n+MAN7_TXT += git-diffcore.txt\n+MAN7_TXT += git-glossary.txt\n+MAN7_TXT += git-namespaces.txt\n+MAN7_TXT += git-revisions.txt\n+MAN7_TXT += git-tutorial-2.txt\n+MAN7_TXT += git-tutorial.txt\n+MAN7_TXT += git-workflows.txt\n \n MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex d7ec507..666c6ed 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -952,23 +952,23 @@ credential..*::\n \tSpecify an external helper to be called when a username or\n \tpassword credential is needed; the helper may consult external\n \tstorage to avoid prompting the user for the credentials. See\n-\tlinkgit:gitcredentials[7] for details.\n+\tlinkgit:git-credentials[7] for details.\n \n credential.useHttpPath::\n \tWhen acquiring credentials, consider the \"path\" component of an http\n \tor https URL to be important. Defaults to false. See\n-\tlinkgit:gitcredentials[7] for more information.\n+\tlinkgit:git-credentials[7] for more information.\n \n credential.username::\n \tIf no username is set for a network authentication, use this username\n \tby default. See credential..* below, and\n-\tlinkgit:gitcredentials[7].\n+\tlinkgit:git-credentials[7].\n \n credential..*::\n \tAny of the credential.* options above can be applied selectively to\n \tsome credentials. For example \"credential.https://example.com.username\"\n \twould set the default username only for https connections to\n-\texample.com. See linkgit:gitcredentials[7] for details on how URLs are\n+\texample.com. See linkgit:git-credentials[7] for details on how URLs are\n \tmatched.\n \n include::diff-config.txt[]\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 39f2c50..562b0d4 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -366,7 +366,7 @@ ifndef::git-format-patch[]\n \tLook for differences that introduce or remove an instance of\n \t. Note that this is different than the string simply\n \tappearing in diff output; see the 'pickaxe' entry in\n-\tlinkgit:gitdiffcore[7] for more details.\n+\tlinkgit:git-diffcore[7] for more details.\n \n -G::\n \tLook for differences whose added or removed line matches\n@@ -481,4 +481,4 @@ For more detailed explanation on these common options, see also\n \tDo not show any source or destination prefix.\n \n For more detailed explanation on these common options, see also\n-linkgit:gitdiffcore[7].\n+linkgit:git-diffcore[7].\ndiff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt\nindex 2fb95bb..0f5b23a 100644\n--- a/Documentation/git-cat-file.txt\n+++ b/Documentation/git-cat-file.txt\n@@ -27,7 +27,7 @@ OPTIONS\n ::\n \tThe name of the object to show.\n \tFor a more complete list of ways to spell object names, see\n-\tthe \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].\n+\tthe \"SPECIFYING REVISIONS\" section in linkgit:git-revisions[7].\n \n -t::\n \tInstead of the content, show the object type identified by\ndiff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt\nindex 98009d1..d598044 100644\n--- a/Documentation/git-check-ref-format.txt\n+++ b/Documentation/git-check-ref-format.txt\n@@ -59,7 +59,7 @@ unquoted (by mistake), and also avoids ambiguities in certain\n These rules make it easy for shell script based tools to parse\n reference names, pathname expansion by the shell when a reference name is used\n unquoted (by mistake), and also avoids ambiguities in certain\n-reference name expressions (see linkgit:gitrevisions[7]):\n+reference name expressions (see linkgit:git-revisions[7]):\n \n . A double-dot `..` is often used as in `ref1..ref2`, and in some\n contexts this notation means `^ref1 ref2` (i.e. not in\ndiff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt\nindex c205d23..c2822b4 100644\n--- a/Documentation/git-cherry-pick.txt\n+++ b/Documentation/git-cherry-pick.txt\n@@ -44,7 +44,7 @@ OPTIONS\n ...::\n \tCommits to cherry-pick.\n \tFor a more complete list of ways to spell commits, see\n-\tlinkgit:gitrevisions[7].\n+\tlinkgit:git-revisions[7].\n \tSets of commits can be passed but no traversal is done by\n \tdefault, as if the '--no-walk' option was specified, see\n \tlinkgit:git-rev-list[1]. Note that specifying a range will\ndiff --git a/Documentation/gitcli.txt b/Documentation/git-cli.txt\nsimilarity index 98%\nrename from Documentation/gitcli.txt\nrename to Documentation/git-cli.txt\nindex 3bc1500..f59f3b6 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/git-cli.txt\n@@ -1,13 +1,13 @@ SYNOPSIS\n-gitcli(7)\n-=========\n+git-cli(7)\n+==========\n \n NAME\n ----\n-gitcli - git command line interface and conventions\n+git-cli - git command line interface and conventions\n \n SYNOPSIS\n --------\n-gitcli\n+git *\n \n \n DESCRIPTION\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 41b27da..d8a5143 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -157,7 +157,7 @@ OPTIONS\n -n::\n --no-verify::\n \tThis option bypasses the pre-commit and commit-msg hooks.\n-\tSee also linkgit:githooks[5].\n+\tSee also linkgit:git-hooks[5].\n \n --allow-empty::\n \tUsually recording a commit that has the exact same tree as its\n@@ -420,7 +420,7 @@ This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,\n HOOKS\n -----\n This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,\n-and `post-commit` hooks. See linkgit:githooks[5] for more\n+and `post-commit` hooks. See linkgit:git-hooks[5] for more\n information.\n \n FILES\ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/git-core-tutorial.txt\nsimilarity index 99%\nrename from Documentation/gitcore-tutorial.txt\nrename to Documentation/git-core-tutorial.txt\nindex 5325c5a..1a07c92 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/git-core-tutorial.txt\n@@ -1,9 +1,9 @@ NAME\n-gitcore-tutorial(7)\n-===================\n+git-core-tutorial(7)\n+====================\n \n NAME\n ----\n-gitcore-tutorial - A git core tutorial for developers\n+git-core-tutorial - A git core tutorial for developers\n \n SYNOPSIS\n --------\n@@ -16,7 +16,7 @@ If you just need to use git as a revision control system you may prefer\n work with a git repository.\n \n If you just need to use git as a revision control system you may prefer\n-to start with \"A Tutorial Introduction to GIT\" (linkgit:gittutorial[7]) or\n+to start with \"A Tutorial Introduction to GIT\" (linkgit:git-tutorial[7]) or\n link:user-manual.html[the GIT User Manual].\n \n However, an understanding of these low-level tools can be helpful if\n@@ -116,7 +116,7 @@ populating your tree.\n populating your tree.\n \n [NOTE]\n-An advanced user may want to take a look at linkgit:gitrepository-layout[5]\n+An advanced user may want to take a look at linkgit:git-repository-layout[5]\n after finishing this tutorial.\n \n You have now created your first git repository. Of course, since it's\n@@ -970,7 +970,7 @@ are branch heads. 'master^' is the first parent of 'master'\n before the commit log message is a short name you can use to\n name the commit. In the above example, 'master' and 'mybranch'\n are branch heads. 'master^' is the first parent of 'master'\n-branch head. Please see linkgit:gitrevisions[7] if you want to\n+branch head. Please see linkgit:git-revisions[7] if you want to\n see more complex cases.\n \n [NOTE]\n@@ -1595,7 +1595,7 @@ cooperation you are probably more familiar with as well.\n have to worry. git supports \"shared public repository\" style of\n cooperation you are probably more familiar with as well.\n \n-See linkgit:gitcvs-migration[7] for the details.\n+See linkgit:git-cvs-migration[7] for the details.\n \n Bundling your work together\n ---------------------------\n@@ -1696,9 +1696,9 @@ SEE ALSO\n \n SEE ALSO\n --------\n-linkgit:gittutorial[7],\n-linkgit:gittutorial-2[7],\n-linkgit:gitcvs-migration[7],\n+linkgit:git-tutorial[7],\n+linkgit:git-tutorial-2[7],\n+linkgit:git-cvs-migration[7],\n linkgit:git-help[1],\n link:everyday.html[Everyday git],\n link:user-manual.html[The Git User's Manual]\ndiff --git a/Documentation/git-credential-cache.txt b/Documentation/git-credential-cache.txt\nindex eeff5fa..4a1c101 100644\n--- a/Documentation/git-credential-cache.txt\n+++ b/Documentation/git-credential-cache.txt\n@@ -21,7 +21,7 @@ be used as a credential helper by other parts of git. See\n \n You probably don't want to invoke this command directly; it is meant to\n be used as a credential helper by other parts of git. See\n-linkgit:gitcredentials[7] or `EXAMPLES` below.\n+linkgit:git-credentials[7] or `EXAMPLES` below.\n \n OPTIONS\n -------\ndiff --git a/Documentation/git-credential-store.txt b/Documentation/git-credential-store.txt\nindex b27c03c..6761191 100644\n--- a/Documentation/git-credential-store.txt\n+++ b/Documentation/git-credential-store.txt\n@@ -24,7 +24,7 @@ be used as a credential helper by other parts of git. See\n \n You probably don't want to invoke this command directly; it is meant to\n be used as a credential helper by other parts of git. See\n-linkgit:gitcredentials[7] or `EXAMPLES` below.\n+linkgit:git-credentials[7] or `EXAMPLES` below.\n \n OPTIONS\n -------\n@@ -67,7 +67,7 @@ username (if we already have one) match, then the password is returned\n credential-store will consider that context a pattern to match against\n each entry in the credentials file. If the protocol, hostname, and\n username (if we already have one) match, then the password is returned\n-to git. See the discussion of configuration in linkgit:gitcredentials[7]\n+to git. See the discussion of configuration in linkgit:git-credentials[7]\n for more information.\n \n GIT\ndiff --git a/Documentation/gitcredentials.txt b/Documentation/git-credentials.txt\nsimilarity index 98%\nrename from Documentation/gitcredentials.txt\nrename to Documentation/git-credentials.txt\nindex 7dfffc0..85aa1b6 100644\n--- a/Documentation/gitcredentials.txt\n+++ b/Documentation/git-credentials.txt\n@@ -1,9 +1,9 @@ NAME\n-gitcredentials(7)\n-=================\n+git-credentials(7)\n+==================\n \n NAME\n ----\n-gitcredentials - providing usernames and passwords to git\n+git-credentials - providing usernames and passwords to git\n \n SYNOPSIS\n --------\ndiff --git a/Documentation/gitcvs-migration.txt b/Documentation/git-cvs-migration.txt\nsimilarity index 94%\nrename from Documentation/gitcvs-migration.txt\nrename to Documentation/git-cvs-migration.txt\nindex aeb0cdc..6adc45a 100644\n--- a/Documentation/gitcvs-migration.txt\n+++ b/Documentation/git-cvs-migration.txt\n@@ -1,9 +1,9 @@ NAME\n-gitcvs-migration(7)\n-===================\n+git-cvs-migration(7)\n+====================\n \n NAME\n ----\n-gitcvs-migration - git for CVS users\n+git-cvs-migration - git for CVS users\n \n SYNOPSIS\n --------\n@@ -20,8 +20,8 @@ Some basic familiarity with git is required. Having gone through\n this document explains how to do that.\n \n Some basic familiarity with git is required. Having gone through\n-linkgit:gittutorial[7] and\n-linkgit:gitglossary[7] should be sufficient.\n+linkgit:git-tutorial[7] and\n+linkgit:git-glossary[7] should be sufficient.\n \n Developing against a shared repository\n --------------------------------------\n@@ -83,7 +83,7 @@ possibly created from scratch or from a tarball (see\n \n We assume you have already created a git repository for your project,\n possibly created from scratch or from a tarball (see\n-linkgit:gittutorial[7]), or imported from an already existing CVS\n+linkgit:git-tutorial[7]), or imported from an already existing CVS\n repository (see the next section).\n \n Assume your existing repo is at /home/alice/myproject. Create a new \"bare\"\n@@ -154,7 +154,7 @@ points. You can use these, for example, to send all commits to the shared\n \n Git allows you to specify scripts called \"hooks\" to be run at certain\n points. You can use these, for example, to send all commits to the shared\n-repository to a mailing list. See linkgit:githooks[5].\n+repository to a mailing list. See linkgit:git-hooks[5].\n \n You can enforce finer grained permissions using update hooks. See\n link:howto/update-hook-example.txt[Controlling access to branches using\n@@ -190,10 +190,10 @@ SEE ALSO\n \n SEE ALSO\n --------\n-linkgit:gittutorial[7],\n-linkgit:gittutorial-2[7],\n-linkgit:gitcore-tutorial[7],\n-linkgit:gitglossary[7],\n+linkgit:git-tutorial[7],\n+linkgit:git-tutorial-2[7],\n+linkgit:git-core-tutorial[7],\n+linkgit:git-glossary[7],\n link:everyday.html[Everyday Git],\n link:user-manual.html[The Git User's Manual]\n \ndiff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt\nindex 9d5353e..ac2cfbf 100644\n--- a/Documentation/git-cvsimport.txt\n+++ b/Documentation/git-cvsimport.txt\n@@ -38,7 +38,7 @@ and use the clone as the shared repository.\n read/write, or if you want to use linkgit:git-cvsserver[1], then you\n probably want to make a bare clone of the imported repository,\n and use the clone as the shared repository.\n-See linkgit:gitcvs-migration[7].\n+See linkgit:git-cvs-migration[7].\n \n \n OPTIONS\ndiff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt\nindex 940c2ba..895c191 100644\n--- a/Documentation/git-cvsserver.txt\n+++ b/Documentation/git-cvsserver.txt\n@@ -163,7 +163,7 @@ You also need to ensure that each repository is \"bare\" (without a git index\n SSH, the users of course also need write access to the git repository itself.\n \n You also need to ensure that each repository is \"bare\" (without a git index\n-file) for `cvs commit` to work. See linkgit:gitcvs-migration[7].\n+file) for `cvs commit` to work. See linkgit:git-cvs-migration[7].\n \n [[configaccessmethod]]\n All configuration variables can also be overridden for a specific method of\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex f8c0601..7c89f0d 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -81,11 +81,11 @@ and the range notations (\"..\" and\n .\n \n For a more complete list of ways to spell , see\n-\"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].\n+\"SPECIFYING REVISIONS\" section in linkgit:git-revisions[7].\n However, \"diff\" is about comparing two _endpoints_, not ranges,\n and the range notations (\"..\" and\n \"\\...\") do not mean a range as defined in the\n-\"SPECIFYING RANGES\" section in linkgit:gitrevisions[7].\n+\"SPECIFYING RANGES\" section in linkgit:git-revisions[7].\n \n OPTIONS\n -------\n@@ -175,7 +175,7 @@ linkgit:git-log[1],\n diff(1),\n linkgit:git-difftool[1],\n linkgit:git-log[1],\n-linkgit:gitdiffcore[7],\n+linkgit:git-diffcore[7],\n linkgit:git-format-patch[1],\n linkgit:git-apply[1]\n \ndiff --git a/Documentation/gitdiffcore.txt b/Documentation/git-diffcore.txt\nsimilarity index 99%\nrename from Documentation/gitdiffcore.txt\nrename to Documentation/git-diffcore.txt\nindex daf1782..9dfdce8 100644\n--- a/Documentation/gitdiffcore.txt\n+++ b/Documentation/git-diffcore.txt\n@@ -1,9 +1,9 @@ NAME\n-gitdiffcore(7)\n+git-diffcore(7)\n ==============\n \n NAME\n ----\n-gitdiffcore - Tweaking diff output\n+git-diffcore - Tweaking diff output\n \n SYNOPSIS\n --------\n@@ -274,7 +274,7 @@ linkgit:git-log[1],\n linkgit:git-diff-tree[1],\n linkgit:git-format-patch[1],\n linkgit:git-log[1],\n-linkgit:gitglossary[7],\n+linkgit:git-glossary[7],\n link:user-manual.html[The Git User's Manual]\n \n GIT\ndiff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt\nindex bf1a02a..6b7d33a 100644\n--- a/Documentation/git-fast-import.txt\n+++ b/Documentation/git-fast-import.txt\n@@ -481,7 +481,7 @@ Marks must be declared (via `mark`) before they can be used.\n * A complete 40 byte or abbreviated commit SHA-1 in hex.\n \n * Any valid Git SHA-1 expression that resolves to a commit. See\n- ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details.\n+ ``SPECIFYING REVISIONS'' in linkgit:git-revisions[7] for details.\n \n The special case of restarting an incremental import from the\n current branch value should be written as:\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 9a914d0..70d7cbf 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -39,7 +39,7 @@ There are two ways to specify which commits to operate on.\n that leads to the to be output.\n \n 2. Generic expression (see \"SPECIFYING\n- REVISIONS\" section in linkgit:gitrevisions[7]) means the\n+ REVISIONS\" section in linkgit:git-revisions[7]) means the\n commits in the specified range.\n \n The first rule takes precedence in the case of a single . To\ndiff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt\nindex b370b02..f54f8c4 100644\n--- a/Documentation/git-gc.txt\n+++ b/Documentation/git-gc.txt\n@@ -142,7 +142,7 @@ The 'git gc --auto' command will run the 'pre-auto-gc' hook. See\n -----\n \n The 'git gc --auto' command will run the 'pre-auto-gc' hook. See\n-linkgit:githooks[5] for more information.\n+linkgit:git-hooks[5] for more information.\n \n \n SEE ALSO\ndiff --git a/Documentation/gitglossary.txt b/Documentation/git-glossary.txt\nsimilarity index 61%\nrename from Documentation/gitglossary.txt\nrename to Documentation/git-glossary.txt\nindex d77a45a..c8157fe 100644\n--- a/Documentation/gitglossary.txt\n+++ b/Documentation/git-glossary.txt\n@@ -1,9 +1,9 @@ NAME\n-gitglossary(7)\n-==============\n+git-glossary(7)\n+===============\n \n NAME\n ----\n-gitglossary - A GIT Glossary\n+git-glossary - A GIT Glossary\n \n SYNOPSIS\n --------\n@@ -16,9 +16,9 @@ SEE ALSO\n \n SEE ALSO\n --------\n-linkgit:gittutorial[7],\n-linkgit:gittutorial-2[7],\n-linkgit:gitcvs-migration[7],\n+linkgit:git-tutorial[7],\n+linkgit:git-tutorial-2[7],\n+linkgit:git-cvs-migration[7],\n link:everyday.html[Everyday git],\n link:user-manual.html[The Git User's Manual]\n \ndiff --git a/Documentation/githooks.txt b/Documentation/git-hooks.txt\nsimilarity index 99%\nrename from Documentation/githooks.txt\nrename to Documentation/git-hooks.txt\nindex d839233..7a3bc3b 100644\n--- a/Documentation/githooks.txt\n+++ b/Documentation/git-hooks.txt\n@@ -1,9 +1,9 @@ NAME\n-githooks(5)\n-===========\n+git-hooks(5)\n+============\n \n NAME\n ----\n-githooks - Hooks used by git\n+git-hooks - Hooks used by git\n \n SYNOPSIS\n --------\ndiff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt\nindex f4e0741..a0ffb25 100644\n--- a/Documentation/git-http-backend.txt\n+++ b/Documentation/git-http-backend.txt\n@@ -120,7 +120,7 @@ ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n ----------------------------------------------------------------\n +\n-To serve multiple repositories from different linkgit:gitnamespaces[7] in a\n+To serve multiple repositories from different linkgit:git-namespaces[7] in a\n single repository:\n +\n ----------------------------------------------------------------\ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex 22c0d6e..79000d4 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -29,7 +29,7 @@ OPTIONS\n \teither or is omitted, it defaults to\n \t`HEAD`, i.e. the tip of the current branch.\n \tFor a more complete list of ways to spell \n-\tand , see linkgit:gitrevisions[7].\n+\tand , see linkgit:git-revisions[7].\n \n --follow::\n \tContinue listing the history of a file beyond renames\ndiff --git a/Documentation/gitnamespaces.txt b/Documentation/git-namespaces.txt\nsimilarity index 97%\nrename from Documentation/gitnamespaces.txt\nrename to Documentation/git-namespaces.txt\nindex c6713cf..a031ee7 100644\n--- a/Documentation/gitnamespaces.txt\n+++ b/Documentation/git-namespaces.txt\n@@ -1,9 +1,9 @@ NAME\n-gitnamespaces(7)\n-================\n+git-namespaces(7)\n+=================\n \n NAME\n ----\n-gitnamespaces - Git namespaces\n+git-namespaces - Git namespaces\n \n SYNOPSIS\n --------\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex c964b79..c78469c 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -43,7 +43,7 @@ it can be any arbitrary \"SHA-1 expression\", such as `master~4` or\n +\n The is often the name of the branch you would want to push, but\n it can be any arbitrary \"SHA-1 expression\", such as `master~4` or\n-`HEAD` (see linkgit:gitrevisions[7]).\n+`HEAD` (see linkgit:git-revisions[7]).\n +\n The tells which ref on the remote side is updated with this\n push. Arbitrary expressions cannot be used here, an actual ref must\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex da067ec..ee5837c 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -295,11 +295,11 @@ which makes little sense.\n \tDo not show a diffstat as part of the rebase process.\n \n --no-verify::\n-\tThis option bypasses the pre-rebase hook. See also linkgit:githooks[5].\n+\tThis option bypasses the pre-rebase hook. See also linkgit:git-hooks[5].\n \n --verify::\n \tAllows the pre-rebase hook to run, which is the default. This option can\n-\tbe used to override --no-verify. See also linkgit:githooks[5].\n+\tbe used to override --no-verify. See also linkgit:git-hooks[5].\n \n -C::\n \tEnsure at least lines of surrounding context match before\ndiff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt\nindex b1f7dc6..905a186 100644\n--- a/Documentation/git-receive-pack.txt\n+++ b/Documentation/git-receive-pack.txt\n@@ -150,7 +150,7 @@ SEE ALSO\n \n SEE ALSO\n --------\n-linkgit:git-send-pack[1], linkgit:gitnamespaces[7]\n+linkgit:git-send-pack[1], linkgit:git-namespaces[7]\n \n GIT\n ---\ndiff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt\nindex 7fe2d22..a12f63b 100644\n--- a/Documentation/git-reflog.txt\n+++ b/Documentation/git-reflog.txt\n@@ -41,7 +41,7 @@ two moves ago\", `master@{one.week.ago}` means \"where master used to\n The reflog is useful in various git commands, to specify the old value\n of a reference. For example, `HEAD@{2}` means \"where HEAD used to be\n two moves ago\", `master@{one.week.ago}` means \"where master used to\n-point to one week ago\", and so on. See linkgit:gitrevisions[7] for\n+point to one week ago\", and so on. See linkgit:git-revisions[7] for\n more details.\n \n To delete single entries from the reflog, use the subcommand \"delete\"\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/git-repository-layout.txt\nsimilarity index 97%\nrename from Documentation/gitrepository-layout.txt\nrename to Documentation/git-repository-layout.txt\nindex 9f62886..7602980 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/git-repository-layout.txt\n@@ -1,9 +1,9 @@ NAME\n-gitrepository-layout(5)\n-=======================\n+git-repository-layout(5)\n+========================\n \n NAME\n ----\n-gitrepository-layout - Git Repository Layout\n+git-repository-layout - Git Repository Layout\n \n SYNOPSIS\n --------\n@@ -136,7 +136,7 @@ hooks::\n \t'git init' is run, but all of them are disabled by\n \tdefault. To enable, the `.sample` suffix has to be\n \tremoved from the filename by renaming.\n-\tRead linkgit:githooks[5] for more details about\n+\tRead linkgit:git-hooks[5] for more details about\n \teach hook.\n \n index::\n@@ -203,7 +203,7 @@ linkgit:git-checkout[1],\n linkgit:git-pack-refs[1],\n linkgit:git-gc[1],\n linkgit:git-checkout[1],\n-linkgit:gitglossary[7],\n+linkgit:git-glossary[7],\n link:user-manual.html[The Git User's Manual]\n \n GIT\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 3c63561..ce9cee4 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -236,7 +236,7 @@ Each line of options has this format:\n \n \t* Use `*` to mean that this option should not be listed in the usage\n \t generated for the `-h` argument. It's shown for `--help-all` as\n-\t documented in linkgit:gitcli[7].\n+\t documented in linkgit:git-cli[7].\n \n \t* Use `!` to not make the corresponding negated long option available.\n \ndiff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt\nindex 70152e8..b6e3a48 100644\n--- a/Documentation/git-revert.txt\n+++ b/Documentation/git-revert.txt\n@@ -35,7 +35,7 @@ OPTIONS\n ...::\n \tCommits to revert.\n \tFor a more complete list of ways to spell commit names, see\n-\tlinkgit:gitrevisions[7].\n+\tlinkgit:git-revisions[7].\n \tSets of commits can also be given but no traversal is done by\n \tdefault, see linkgit:git-rev-list[1] and its '--no-walk'\n \toption.\ndiff --git a/Documentation/gitrevisions.txt b/Documentation/git-revisions.txt\nsimilarity index 88%\nrename from Documentation/gitrevisions.txt\nrename to Documentation/git-revisions.txt\nindex fc4789f..3bf4531 100644\n--- a/Documentation/gitrevisions.txt\n+++ b/Documentation/git-revisions.txt\n@@ -1,13 +1,13 @@ SYNOPSIS\n-gitrevisions(7)\n+git-revisions(7)\n ================\n \n NAME\n ----\n-gitrevisions - specifying revisions and ranges for git\n+git-revisions - specifying revisions and ranges for git\n \n SYNOPSIS\n --------\n-gitrevisions\n+git-revisions\n \n \n DESCRIPTION\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex a8e77b5..d5c27f7 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -31,7 +31,7 @@ OPTIONS\n OPTIONS\n -------\n ::\n-\tArbitrary extended SHA1 expression (see linkgit:gitrevisions[7])\n+\tArbitrary extended SHA1 expression (see linkgit:git-revisions[7])\n \tthat typically names a branch head or a tag.\n \n ::\ndiff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt\nindex 5dbcd47..ca28bc7 100644\n--- a/Documentation/git-show-ref.txt\n+++ b/Documentation/git-show-ref.txt\n@@ -175,7 +175,7 @@ linkgit:git-update-ref[1],\n --------\n linkgit:git-ls-remote[1],\n linkgit:git-update-ref[1],\n-linkgit:gitrepository-layout[5]\n+linkgit:git-repository-layout[5]\n \n GIT\n ---\ndiff --git a/Documentation/git-show.txt b/Documentation/git-show.txt\nindex ae4edcc..81bd45e 100644\n--- a/Documentation/git-show.txt\n+++ b/Documentation/git-show.txt\n@@ -37,7 +37,7 @@ OPTIONS\n ...::\n \tThe names of objects to show.\n \tFor a more complete list of ways to spell object names, see\n-\t\"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].\n+\t\"SPECIFYING REVISIONS\" section in linkgit:git-revisions[7].\n \n include::pretty-options.txt[]\n \ndiff --git a/Documentation/gittutorial-2.txt b/Documentation/git-tutorial-2.txt\nsimilarity index 96%\nrename from Documentation/gittutorial-2.txt\nrename to Documentation/git-tutorial-2.txt\nindex e00a4d2..8ca2912 100644\n--- a/Documentation/gittutorial-2.txt\n+++ b/Documentation/git-tutorial-2.txt\n@@ -1,9 +1,9 @@ NAME\n-gittutorial-2(7)\n-================\n+git-tutorial-2(7)\n+=================\n \n NAME\n ----\n-gittutorial-2 - A tutorial introduction to git: part two\n+git-tutorial-2 - A tutorial introduction to git: part two\n \n SYNOPSIS\n --------\n@@ -13,7 +13,7 @@ DESCRIPTION\n DESCRIPTION\n -----------\n \n-You should work through linkgit:gittutorial[7] before reading this tutorial.\n+You should work through linkgit:git-tutorial[7] before reading this tutorial.\n \n The goal of this tutorial is to introduce two fundamental pieces of\n git's architecture--the object database and the index file--and to\n@@ -395,7 +395,7 @@ branch, and is used to hold the trees involved in a merge operation.\n In addition to being the staging area for new commits, the index file\n is also populated from the object database when checking out a\n branch, and is used to hold the trees involved in a merge operation.\n-See linkgit:gitcore-tutorial[7] and the relevant man\n+See linkgit:git-core-tutorial[7] and the relevant man\n pages for details.\n \n What next?\n@@ -404,28 +404,28 @@ SEE ALSO\n At this point you should know everything necessary to read the man\n pages for any of the git commands; one good place to start would be\n with the commands mentioned in link:everyday.html[Everyday git]. You\n-should be able to find any unknown jargon in linkgit:gitglossary[7].\n+should be able to find any unknown jargon in linkgit:git-glossary[7].\n \n The link:user-manual.html[Git User's Manual] provides a more\n comprehensive introduction to git.\n \n-linkgit:gitcvs-migration[7] explains how to\n+linkgit:git-cvs-migration[7] explains how to\n import a CVS repository into git, and shows how to use git in a\n CVS-like way.\n \n For some interesting examples of git use, see the\n link:howto-index.html[howtos].\n \n-For git developers, linkgit:gitcore-tutorial[7] goes\n+For git developers, linkgit:git-core-tutorial[7] goes\n into detail on the lower-level git mechanisms involved in, for\n example, creating a new commit.\n \n SEE ALSO\n --------\n-linkgit:gittutorial[7],\n-linkgit:gitcvs-migration[7],\n-linkgit:gitcore-tutorial[7],\n-linkgit:gitglossary[7],\n+linkgit:git-tutorial[7],\n+linkgit:git-cvs-migration[7],\n+linkgit:git-core-tutorial[7],\n+linkgit:git-glossary[7],\n linkgit:git-help[1],\n link:everyday.html[Everyday git],\n link:user-manual.html[The Git User's Manual]\ndiff --git a/Documentation/gittutorial.txt b/Documentation/git-tutorial.txt\nsimilarity index 97%\nrename from Documentation/gittutorial.txt\nrename to Documentation/git-tutorial.txt\nindex f1cb6f3..189d01f 100644\n--- a/Documentation/gittutorial.txt\n+++ b/Documentation/git-tutorial.txt\n@@ -1,9 +1,9 @@ NAME\n-gittutorial(7)\n-==============\n+git-tutorial(7)\n+===============\n \n NAME\n ----\n-gittutorial - A tutorial introduction to git (for version 1.5.1 or newer)\n+git-tutorial - A tutorial introduction to git (for version 1.5.1 or newer)\n \n SYNOPSIS\n --------\n@@ -455,7 +455,7 @@ that various users push changes to; see linkgit:git-push[1] and\n \n Git can also be used in a CVS-like mode, with a central repository\n that various users push changes to; see linkgit:git-push[1] and\n-linkgit:gitcvs-migration[7].\n+linkgit:git-cvs-migration[7].\n \n Exploring history\n -----------------\n@@ -636,7 +636,7 @@ database, the index file, and a few other odds and ends that you'll\n \n Part two of this tutorial explains the object\n database, the index file, and a few other odds and ends that you'll\n-need to make the most of git. You can find it at linkgit:gittutorial-2[7].\n+need to make the most of git. You can find it at linkgit:git-tutorial-2[7].\n \n If you don't want to continue with that right away, a few other\n digressions that may be interesting at this point are:\n@@ -653,21 +653,21 @@ linkgit:git-help[1],\n smart enough to perform a close-to-optimal search even in the\n case of complex non-linear history with lots of merged branches.\n \n- * linkgit:gitworkflows[7]: Gives an overview of recommended\n+ * linkgit:git-workflows[7]: Gives an overview of recommended\n workflows.\n \n * link:everyday.html[Everyday GIT with 20 Commands Or So]\n \n- * linkgit:gitcvs-migration[7]: Git for CVS users.\n+ * linkgit:git-cvs-migration[7]: Git for CVS users.\n \n SEE ALSO\n --------\n-linkgit:gittutorial-2[7],\n-linkgit:gitcvs-migration[7],\n-linkgit:gitcore-tutorial[7],\n-linkgit:gitglossary[7],\n+linkgit:git-tutorial-2[7],\n+linkgit:git-cvs-migration[7],\n+linkgit:git-core-tutorial[7],\n+linkgit:git-glossary[7],\n linkgit:git-help[1],\n-linkgit:gitworkflows[7],\n+linkgit:git-workflows[7],\n link:everyday.html[Everyday git],\n link:user-manual.html[The Git User's Manual]\n \ndiff --git a/Documentation/git-update-server-info.txt b/Documentation/git-update-server-info.txt\nindex bd0e364..800ab5e 100644\n--- a/Documentation/git-update-server-info.txt\n+++ b/Documentation/git-update-server-info.txt\n@@ -32,7 +32,7 @@ Currently the command updates the following files. Please see\n ------\n \n Currently the command updates the following files. Please see\n-linkgit:gitrepository-layout[5] for description of\n+linkgit:git-repository-layout[5] for description of\n what they are for:\n \n * objects/info/packs\ndiff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt\nindex 71f1608..44b9219 100644\n--- a/Documentation/git-upload-pack.txt\n+++ b/Documentation/git-upload-pack.txt\n@@ -36,7 +36,7 @@ SEE ALSO\n \n SEE ALSO\n --------\n-linkgit:gitnamespaces[7]\n+linkgit:git-namespaces[7]\n \n GIT\n ---\ndiff --git a/Documentation/gitworkflows.txt b/Documentation/git-workflows.txt\nsimilarity index 99%\nrename from Documentation/gitworkflows.txt\nrename to Documentation/git-workflows.txt\nindex 8b8c6ae..8fe1c95 100644\n--- a/Documentation/gitworkflows.txt\n+++ b/Documentation/git-workflows.txt\n@@ -1,9 +1,9 @@ NAME\n-gitworkflows(7)\n-===============\n+git-workflows(7)\n+================\n \n NAME\n ----\n-gitworkflows - An overview of recommended workflows with git\n+git-workflows - An overview of recommended workflows with git\n \n SYNOPSIS\n --------\n@@ -466,7 +466,7 @@ SEE ALSO\n \n SEE ALSO\n --------\n-linkgit:gittutorial[7],\n+linkgit:git-tutorial[7],\n linkgit:git-push[1],\n linkgit:git-pull[1],\n linkgit:git-merge[1],\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 555250d..d9d7755 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -21,14 +21,14 @@ page to learn what commands git offers. You can learn more about\n unusually rich command set that provides both high-level operations\n and full access to internals.\n \n-See linkgit:gittutorial[7] to get started, then see\n+See linkgit:git-tutorial[7] to get started, then see\n link:everyday.html[Everyday Git] for a useful minimum set of\n commands. The link:user-manual.html[Git User's Manual] has a more\n in-depth introduction.\n \n After you mastered the basic concepts, you can come back to this\n page to learn what commands git offers. You can learn more about\n-individual git commands with \"git help command\". linkgit:gitcli[7]\n+individual git commands with \"git help command\". linkgit:git-cli[7]\n manual page gives you an overview of the command line command syntax.\n \n Formatted and hyperlinked version of the latest git documentation\n@@ -416,7 +416,7 @@ help ...`.\n \tmore detailed discussion).\n \n --namespace=::\n-\tSet the git namespace. See linkgit:gitnamespaces[7] for more\n+\tSet the git namespace. See linkgit:git-namespaces[7] for more\n \tdetails. Equivalent to setting the `GIT_NAMESPACE` environment\n \tvariable.\n \n@@ -611,15 +611,15 @@ Please see the linkgit:gitrepository-layout[5] document.\n \t(i.e. a `refs/heads/` reference).\n \n For a more complete list of ways to spell object names, see\n-\"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].\n+\"SPECIFYING REVISIONS\" section in linkgit:git-revisions[7].\n \n \n File/Directory Structure\n ------------------------\n \n-Please see the linkgit:gitrepository-layout[5] document.\n+Please see the linkgit:git-repository-layout[5] document.\n \n-Read linkgit:githooks[5] for more details about each hook.\n+Read linkgit:git-hooks[5] for more details about each hook.\n \n Higher level SCMs may provide and manage additional information in the\n `$GIT_DIR`.\n@@ -627,7 +627,7 @@ Terminology\n \n Terminology\n -----------\n-Please see linkgit:gitglossary[7].\n+Please see linkgit:git-glossary[7].\n \n \n Environment Variables\n@@ -672,7 +672,7 @@ git so take care if using Cogito etc.\n \toption and the core.worktree configuration variable.\n \n 'GIT_NAMESPACE'::\n-\tSet the git namespace; see linkgit:gitnamespaces[7] for details.\n+\tSet the git namespace; see linkgit:git-namespaces[7] for details.\n \tThe '--namespace' command-line option also sets this value.\n \n 'GIT_CEILING_DIRECTORIES'::\n@@ -825,7 +825,7 @@ link:user-manual.html#git-concepts[git concepts chapter of the\n \n More detail on the following is available from the\n link:user-manual.html#git-concepts[git concepts chapter of the\n-user-manual] and linkgit:gitcore-tutorial[7].\n+user-manual] and linkgit:git-core-tutorial[7].\n \n A git project normally consists of a working directory with a \".git\"\n subdirectory at the top level. The .git directory contains, among other\n@@ -881,10 +881,10 @@ introductions to the underlying git architecture.\n for a first-time user.\n \n The link:user-manual.html#git-concepts[git concepts chapter of the\n-user-manual] and linkgit:gitcore-tutorial[7] both provide\n+user-manual] and linkgit:git-core-tutorial[7] both provide\n introductions to the underlying git architecture.\n \n-See linkgit:gitworkflows[7] for an overview of recommended workflows.\n+See linkgit:git-workflows[7] for an overview of recommended workflows.\n \n See also the link:howto-index.html[howto] documents for some useful\n examples.\n@@ -893,7 +893,7 @@ Users migrating from CVS may also want to\n link:technical/api-index.html[GIT API documentation].\n \n Users migrating from CVS may also want to\n-read linkgit:gitcvs-migration[7].\n+read linkgit:git-cvs-migration[7].\n \n \n Authors\n@@ -916,12 +916,13 @@ Part of the linkgit:git[1] suite\n \n SEE ALSO\n --------\n-linkgit:gittutorial[7], linkgit:gittutorial-2[7],\n-link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],\n-linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],\n-linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],\n-linkgit:gitworkflows[7]\n+linkgit:git-tutorial[7], linkgit:git-tutorial-2[7],\n+link:everyday.html[Everyday Git], linkgit:git-cvs-migration[7],\n+linkgit:git-glossary[7], linkgit:git-core-tutorial[7],\n+linkgit:git-cli[7], link:user-manual.html[The Git User's Manual],\n+linkgit:git-workflows[7]\n \n GIT\n ---\n Part of the linkgit:git[1] suite\n+\ndiff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt\nindex 0da205f..5b6d396 100644\n--- a/Documentation/gitignore.txt\n+++ b/Documentation/gitignore.txt\n@@ -186,7 +186,7 @@ linkgit:git-update-index[1],\n --------\n linkgit:git-rm[1],\n linkgit:git-update-index[1],\n-linkgit:gitrepository-layout[5],\n+linkgit:git-repository-layout[5],\n linkgit:git-check-ignore[1]\n \n GIT\ndiff --git a/Documentation/gitk.txt b/Documentation/gitk.txt\nindex a17a354..a931cb2 100644\n--- a/Documentation/gitk.txt\n+++ b/Documentation/gitk.txt\n@@ -70,7 +70,7 @@ frequently used options.\n \tthe form \"''..''\" to show all revisions between '' and\n \tback to ''. Note, more advanced revision selection can be applied.\n \tFor a more complete list of ways to spell object names, see\n-\tlinkgit:gitrevisions[7].\n+\tlinkgit:git-revisions[7].\n \n ...::\n \ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex 4947455..05a2384 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -676,7 +676,7 @@ description of `-S` option, which refers to pickaxe entry in\n +\n The pickaxe search is described in linkgit:git-log[1] (the\n description of `-S` option, which refers to pickaxe entry in\n-linkgit:gitdiffcore[7] for more details).\n+linkgit:git-diffcore[7] for more details).\n +\n This feature can be configured on a per-repository basis by setting\n repository's `gitweb.pickaxe` configuration variable (boolean).\ndiff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt\nindex 5977b58..642d570 100644\n--- a/Documentation/technical/api-credentials.txt\n+++ b/Documentation/technical/api-credentials.txt\n@@ -263,6 +263,6 @@ See also\n See also\n --------\n \n-linkgit:gitcredentials[7]\n+linkgit:git-credentials[7]\n \n linkgit:git-config[5] (See configuration variables `credential.*`)\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 1b377dc..0bde9b7 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -408,7 +408,7 @@ references with the same shorthand name, see the \"SPECIFYING\n For the complete list of paths which git checks for references, and\n the order it uses to decide which to choose when there are multiple\n references with the same shorthand name, see the \"SPECIFYING\n-REVISIONS\" section of linkgit:gitrevisions[7].\n+REVISIONS\" section of linkgit:git-revisions[7].\n \n [[Updating-a-repository-With-git-fetch]]\n Updating a repository with git fetch\n@@ -579,7 +579,7 @@ There are many more; see the \"SPECIFYING REVISIONS\" section of the\n \t- HEAD: refers to the head of the current branch\n \n There are many more; see the \"SPECIFYING REVISIONS\" section of the\n-linkgit:gitrevisions[7] man page for the complete list of ways to\n+linkgit:git-revisions[7] man page for the complete list of ways to\n name revisions. Some examples:\n \n -------------------------------------------------\n@@ -920,7 +920,7 @@ $ gitk $( git show-ref --heads ) --not $( git show-ref --tags )\n $ gitk $( git show-ref --heads ) --not $( git show-ref --tags )\n -------------------------------------------------\n \n-(See linkgit:gitrevisions[7] for explanations of commit-selecting\n+(See linkgit:git-revisions[7] for explanations of commit-selecting\n syntax such as `--not`.)\n \n [[making-a-release]]\n@@ -1651,7 +1651,7 @@ how to control this pruning, and see the \"SPECIFYING REVISIONS\"\n The reflogs are kept by default for 30 days, after which they may be\n pruned. See linkgit:git-reflog[1] and linkgit:git-gc[1] to learn\n how to control this pruning, and see the \"SPECIFYING REVISIONS\"\n-section of linkgit:gitrevisions[7] for details.\n+section of linkgit:git-revisions[7] for details.\n \n Note that the reflog history is very different from normal git history.\n While normal history is shared by every repository that works on the\n@@ -1949,7 +1949,7 @@ $ mv hooks/post-update.sample hooks/post-update\n -------------------------------------------------\n \n (For an explanation of the last two lines, see\n-linkgit:git-update-server-info[1] and linkgit:githooks[5].)\n+linkgit:git-update-server-info[1] and linkgit:git-hooks[5].)\n \n Advertise the URL of proj.git. Anybody else should then be able to\n clone or pull from that URL, for example with a command line like:\n@@ -2061,7 +2061,7 @@ pull, or by a fetch followed by a rebase; see the\n solution is to retry the push after first updating your work: either by a\n pull, or by a fetch followed by a rebase; see the\n <> and\n-linkgit:gitcvs-migration[7] for more.\n+linkgit:git-cvs-migration[7] for more.\n \n [[setting-up-a-shared-repository]]\n Setting up a shared repository\n@@ -2070,7 +2070,7 @@ all push to and pull from a single shared repository. See\n Another way to collaborate is by using a model similar to that\n commonly used in CVS, where several developers with special rights\n all push to and pull from a single shared repository. See\n-linkgit:gitcvs-migration[7] for instructions on how to\n+linkgit:git-cvs-migration[7] for instructions on how to\n set this up.\n \n However, while there is nothing wrong with git's support for shared\ndiff --git a/builtin/help.c b/builtin/help.c\nindex 6067a61..1eca4ea 100644\n--- a/builtin/help.c\n+++ b/builtin/help.c\n@@ -308,10 +308,8 @@ static const char *cmd_to_page(const char *git_cmd)\n \t\treturn \"git\";\n \telse if (!prefixcmp(git_cmd, \"git\"))\n \t\treturn git_cmd;\n-\telse if (is_git_command(git_cmd))\n-\t\treturn prepend(\"git-\", git_cmd);\n \telse\n-\t\treturn prepend(\"git\", git_cmd);\n+\t\treturn prepend(\"git-\", git_cmd);\n }\n \n static void setup_man_path(void)\n-- \n1.8.1.2.11.g1a2f572\n"},{"id":"208485","messageId":"7vr4kzamt7.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130201073352.GB970@sigill.intra.peff.net","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-01T18:52:52Z","receivedAt":"2013-02-01T18:52:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> Right. So we have some that must be \"gitfoo\", and others that do not\n> care. If we turned \"githooks\" into \"git-hooks\" and removed the \"is it a\n> command?\" magic from \"git help\", then \"git help hooks\" would still find\n> hooks. And likewise, \"git help gitignore\" would still find \"gitignore\".\n> But you could no longer say \"git help ignore\" to find \"gitignore\".\n\nWhich I think is a good thing ;-)\n\n> Which personally I am OK with. It is not a sensible thing to ask for;\n> the concept is not \"ignore\", but rather \"the gitignore file\".\n\nYes, exactly.\n\n> 4. Replace the rename \"gitfoo\" above with a \"see git-foo...\" pointer.\n> Users of \"git help foo\" would not ever see this, but people who\n> have trained their fingers to type \"man gitfoo\" would, along with\n> anybody following an outdated HTML link.\n>\n> 5. Update internal references to \"linkgit:gitfoo\" to point to\n> \"git-foo\".\n>\n> Hmm. That really does not seem so bad. The biggest downside is the\n> people who have to see the redirect made in step 4.\n\nYeah, I see that a show-stopper in the whole sequence.\n\nThis is one of the \"if we had perfect knowledge we would have\ndesigned it this way, and we could still migrate our current system\nto that ideal, but it is dubious the difference between the current\nsystem and the ideal will outweigh the cost of migration\" moment,\nisn't it?\n"},{"id":"208487","messageId":"20130201190007.GB22919@sigill.intra.peff.net","threadId":"32784","inReplyTo":"7vr4kzamt7.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T19:00:08Z","receivedAt":"2013-02-01T19:00:08Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Feb 01, 2013 at 10:52:52AM -0800, Junio C Hamano wrote:\n\n> > 4. Replace the rename \"gitfoo\" above with a \"see git-foo...\" pointer.\n> > Users of \"git help foo\" would not ever see this, but people who\n> > have trained their fingers to type \"man gitfoo\" would, along with\n> > anybody following an outdated HTML link.\n> >\n> > 5. Update internal references to \"linkgit:gitfoo\" to point to\n> > \"git-foo\".\n> >\n> > Hmm. That really does not seem so bad. The biggest downside is the\n> > people who have to see the redirect made in step 4.\n> \n> Yeah, I see that a show-stopper in the whole sequence.\n> \n> This is one of the \"if we had perfect knowledge we would have\n> designed it this way, and we could still migrate our current system\n> to that ideal, but it is dubious the difference between the current\n> system and the ideal will outweigh the cost of migration\" moment,\n> isn't it?\n\nYeah, perhaps. I did the patch series just to see what the effort would\nbe like. But at this point I am fine if we drop it (it sounded like\nJonathan was in favor of this direction, so maybe he wants to make a\nfinal argument).\n\n-Peff\n"},{"id":"208489","messageId":"20130201192010.GA12368@google.com","threadId":"32784","inReplyTo":"20130201082650.GA25783@sigill.intra.peff.net","subject":"Re: [PATCH 1/2] Documentation/Makefile: clean up MAN*_TXT lists","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-02-01T19:20:10Z","receivedAt":"2013-02-01T19:20:10Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jeff King wrote:\n\n> We keep a list of the various files that end up as man1,\n> man5, etc. Let's break these single-line lists into sorted\n> multi-line lists, which makes diffs that touch them much\n> easier to read.\n\nIndependentally of the rest of the series, I think this is a good\ncleanup.\n\n> --- a/Documentation/Makefile\n> +++ b/Documentation/Makefile\n> @@ -1,13 +1,28 @@ MAN7_TXT += gitcredentials.txt\n> -MAN1_TXT= \\\n> -\t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n> -\t\t$(wildcard git-*.txt)) \\\n> -\tgitk.txt gitweb.txt git.txt\n> +MAN1_TXT += git.txt\n> +MAN1_TXT += gitk.txt\n> +MAN1_TXT += gitweb.txt\n> +\n\nIf the user happens to have MAN[157]_TXT set in the environment, this\nwould be affected by that. How about:\n\n\t# Guard against environment variables\n\tMAN1_TXT =\n\tMAN5_TXT =\n\tMAN7_TXT =\n\t\n\tMAN1_TXT += ...\n\t...\n\n?\n\nWith that change,\nReviewed-by: Jonathan Nieder \n"},{"id":"208490","messageId":"20130201192559.GB12368@google.com","threadId":"32784","inReplyTo":"20130201082744.GB25783@sigill.intra.peff.net","subject":"Re: [PATCH 2/2] docs: convert \"concept\" manpages to git-*","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-02-01T19:25:59Z","receivedAt":"2013-02-01T19:25:59Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jeff King wrote:\n\n> Let's just call everything git-*, which is simpler. This\n> patch renames the documentation files, updates the Makefile\n> to find them, and updates internal linkgit references to the\n> pages. It updates builtin/help.c so that users of \"git help\n> foo\" will not even notice the difference.\n>\n> Users of external html links, or users who have trained\n> their fingers to type \"man gitfoo\" will notice the missing\n> pages. This patch does not install a \"this page has moved\"\n> placeholder, but that can easily be done on top.\n\nThanks for writing this.\n\nI think this one should wait until someone (perhaps me) takes care of\nthe redirects. Ideally in addition to simple \"this place has moved\"\nHTML placeholders and manpages using the .so macro, a makefile target\nto generate redirect directives for your apache configuration might\nmake sense.\n\nIn the meantime, having \"man gitrepository-layout\" is not the worst\nwart in the world.\n\nCheers,\nJonathan\n"},{"id":"208493","messageId":"7vehgzakop.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130201192010.GA12368@google.com","subject":"Re: [PATCH 1/2] Documentation/Makefile: clean up MAN*_TXT lists","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-01T19:38:46Z","receivedAt":"2013-02-01T19:38:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n>> --- a/Documentation/Makefile\n>> +++ b/Documentation/Makefile\n>> @@ -1,13 +1,28 @@ MAN7_TXT += gitcredentials.txt\n>> -MAN1_TXT= \\\n>> -\t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n>> -\t\t$(wildcard git-*.txt)) \\\n>> -\tgitk.txt gitweb.txt git.txt\n>> +MAN1_TXT += git.txt\n>> +MAN1_TXT += gitk.txt\n>> +MAN1_TXT += gitweb.txt\n>> +\n>\n> If the user happens to have MAN[157]_TXT set in the environment, this\n> would be affected by that. How about:\n>\n> \t# Guard against environment variables\n> \tMAN1_TXT =\n> \tMAN5_TXT =\n> \tMAN7_TXT =\n> \t\n> \tMAN1_TXT += ...\n> \t...\n>\n> With that change,\n> Reviewed-by: Jonathan Nieder \n\nSounds sensible. Let's go in that direction.\n\nThanks.\n"},{"id":"208494","messageId":"20130201193851.GA24588@sigill.intra.peff.net","threadId":"32784","inReplyTo":"20130201192010.GA12368@google.com","subject":"Re: [PATCH 1/2] Documentation/Makefile: clean up MAN*_TXT lists","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T19:38:51Z","receivedAt":"2013-02-01T19:38:51Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Feb 01, 2013 at 11:20:10AM -0800, Jonathan Nieder wrote:\n\n> Jeff King wrote:\n> \n> > We keep a list of the various files that end up as man1,\n> > man5, etc. Let's break these single-line lists into sorted\n> > multi-line lists, which makes diffs that touch them much\n> > easier to read.\n> \n> Independentally of the rest of the series, I think this is a good\n> cleanup.\n\nYeah, I'd agree.\n\n> > --- a/Documentation/Makefile\n> > +++ b/Documentation/Makefile\n> > @@ -1,13 +1,28 @@ MAN7_TXT += gitcredentials.txt\n> > -MAN1_TXT= \\\n> > -\t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n> > -\t\t$(wildcard git-*.txt)) \\\n> > -\tgitk.txt gitweb.txt git.txt\n> > +MAN1_TXT += git.txt\n> > +MAN1_TXT += gitk.txt\n> > +MAN1_TXT += gitweb.txt\n> > +\n> \n> If the user happens to have MAN[157]_TXT set in the environment, this\n> would be affected by that. How about:\n> \n> \t# Guard against environment variables\n> \tMAN1_TXT =\n> \tMAN5_TXT =\n> \tMAN7_TXT =\n> \t\n> \tMAN1_TXT += ...\n> \t...\n> \n> ?\n\nSure, not that likely, but no reason not to be careful. I notice the\nrest of the file uses the:\n\n FOO = first\n FOO += second\n ...\n\npattern, though I prefer the style you showed myself.\n\nJunio, do you want to apply the patch below? I guess it conflicts with\nJohn's gitremote-helper.txt tweak, though.\n\n-- >8 --\nSubject: [PATCH] Documentation/Makefile: clean up MAN*_TXT lists\n\nWe keep a list of the various files that end up as man1,\nman5, etc. Let's break these single-line lists into sorted\nmulti-line lists, which makes diffs that touch them much\neasier to read.\n\nReviewed-by: Jonathan Nieder \nSigned-off-by: Jeff King \n---\n Documentation/Makefile | 33 ++++++++++++++++++++++++---------\n 1 file changed, 24 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 971977b..8e7939f 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,13 +1,28 @@ MAN7_TXT += gitcredentials.txt\n-MAN1_TXT= \\\n-\t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n-\t\t$(wildcard git-*.txt)) \\\n-\tgitk.txt gitweb.txt git.txt\n-MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \\\n-\tgitrepository-layout.txt gitweb.conf.txt\n-MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \\\n-\tgitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \\\n-\tgitdiffcore.txt gitnamespaces.txt gitrevisions.txt gitworkflows.txt\n+MAN1_TXT += $(filter-out \\\n+\t\t$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n+\t\t$(wildcard git-*.txt))\n+MAN1_TXT += git.txt\n+MAN1_TXT += gitk.txt\n+MAN1_TXT += gitweb.txt\n+\n+MAN5_TXT += gitattributes.txt\n+MAN5_TXT += githooks.txt\n+MAN5_TXT += gitignore.txt\n+MAN5_TXT += gitmodules.txt\n+MAN5_TXT += gitrepository-layout.txt\n+MAN5_TXT += gitweb.conf.txt\n+\n+MAN7_TXT += gitcli.txt\n+MAN7_TXT += gitcore-tutorial.txt\n MAN7_TXT += gitcredentials.txt\n+MAN7_TXT += gitcvs-migration.txt\n+MAN7_TXT += gitdiffcore.txt\n+MAN7_TXT += gitglossary.txt\n+MAN7_TXT += gitnamespaces.txt\n+MAN7_TXT += gitrevisions.txt\n+MAN7_TXT += gittutorial-2.txt\n+MAN7_TXT += gittutorial.txt\n+MAN7_TXT += gitworkflows.txt\n \n MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n-- \n1.8.1.2.11.g1a2f572\n"},{"id":"208495","messageId":"20130201194114.GA24939@sigill.intra.peff.net","threadId":"32784","inReplyTo":"20130201193851.GA24588@sigill.intra.peff.net","subject":"Re: [PATCH 1/2] Documentation/Makefile: clean up MAN*_TXT lists","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2013-02-01T19:41:14Z","receivedAt":"2013-02-01T19:41:14Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Feb 01, 2013 at 02:38:51PM -0500, Jeff King wrote:\n\n> Junio, do you want to apply the patch below? I guess it conflicts with\n> John's gitremote-helper.txt tweak, though.\n\nArgh, it would help if I actually ran \"git commit\", and/or looked at\nwhat I was sending out. Here it is with the actual change.\n\n-- >8 --\nSubject: [PATCH] Documentation/Makefile: clean up MAN*_TXT lists\n\nWe keep a list of the various files that end up as man1,\nman5, etc. Let's break these single-line lists into sorted\nmulti-line lists, which makes diffs that touch them much\neasier to read.\n\nReviewed-by: Jonathan Nieder \nSigned-off-by: Jeff King \n---\n Documentation/Makefile | 38 +++++++++++++++++++++++++++++---------\n 1 file changed, 29 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 971977b..5d22e0e 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,13 +1,33 @@ MAN7_TXT += gitcredentials.txt\n-MAN1_TXT= \\\n-\t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n-\t\t$(wildcard git-*.txt)) \\\n-\tgitk.txt gitweb.txt git.txt\n-MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \\\n-\tgitrepository-layout.txt gitweb.conf.txt\n-MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \\\n-\tgitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \\\n-\tgitdiffcore.txt gitnamespaces.txt gitrevisions.txt gitworkflows.txt\n+# Guard against environment variables\n+MAN1_TXT =\n+MAN5_TXT =\n+MAN7_TXT =\n+\n+MAN1_TXT += $(filter-out \\\n+\t\t$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n+\t\t$(wildcard git-*.txt))\n+MAN1_TXT += git.txt\n+MAN1_TXT += gitk.txt\n+MAN1_TXT += gitweb.txt\n+\n+MAN5_TXT += gitattributes.txt\n+MAN5_TXT += githooks.txt\n+MAN5_TXT += gitignore.txt\n+MAN5_TXT += gitmodules.txt\n+MAN5_TXT += gitrepository-layout.txt\n+MAN5_TXT += gitweb.conf.txt\n+\n+MAN7_TXT += gitcli.txt\n+MAN7_TXT += gitcore-tutorial.txt\n MAN7_TXT += gitcredentials.txt\n+MAN7_TXT += gitcvs-migration.txt\n+MAN7_TXT += gitdiffcore.txt\n+MAN7_TXT += gitglossary.txt\n+MAN7_TXT += gitnamespaces.txt\n+MAN7_TXT += gitrevisions.txt\n+MAN7_TXT += gittutorial-2.txt\n+MAN7_TXT += gittutorial.txt\n+MAN7_TXT += gitworkflows.txt\n \n MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)\n MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))\n-- \n1.8.1.2.11.g1a2f572\n"},{"id":"208510","messageId":"7vpq0j8yvi.fsf@alter.siamese.dyndns.org","threadId":"32784","inReplyTo":"20130201190007.GB22919@sigill.intra.peff.net","subject":"Re: [PATCH] Rename {git- => git}remote-helpers.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-01T22:15:13Z","receivedAt":"2013-02-01T22:15:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Fri, Feb 01, 2013 at 10:52:52AM -0800, Junio C Hamano wrote:\n>\n>> > 4. Replace the rename \"gitfoo\" above with a \"see git-foo...\" pointer.\n>> > Users of \"git help foo\" would not ever see this, but people who\n>> > have trained their fingers to type \"man gitfoo\" would, along with\n>> > anybody following an outdated HTML link.\n>> >\n>> > 5. Update internal references to \"linkgit:gitfoo\" to point to\n>> > \"git-foo\".\n>> >\n>> > Hmm. That really does not seem so bad. The biggest downside is the\n>> > people who have to see the redirect made in step 4.\n>> \n>> Yeah, I see that a show-stopper in the whole sequence.\n>> \n>> This is one of the \"if we had perfect knowledge we would have\n>> designed it this way, and we could still migrate our current system\n>> to that ideal, but it is dubious the difference between the current\n>> system and the ideal will outweigh the cost of migration\" moment,\n>> isn't it?\n>\n> Yeah, perhaps. I did the patch series just to see what the effort would\n> be like. But at this point I am fine if we drop it (it sounded like\n> Jonathan was in favor of this direction, so maybe he wants to make a\n> final argument).\n\nOK.\n"}]}