{"thread":{"id":"43451","subject":"Re: [PATCH 2/2] Swap the porcelain and plumbing commands in the git man page","startedAt":"2006-10-29T20:09:40Z","lastAt":"2006-10-29T20:47:27Z","messageCount":3,"participants":["Junio C Hamano","Robin Rosenberg"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"296603","messageId":"20061029200940.11233.20277.stgit@lathund.dewire.com","threadId":"43451","inReplyTo":null,"subject":"[PATCH 1/2] Mention that pull can work locally in the synopsis","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2006-10-29T20:09:40Z","receivedAt":"2006-10-29T20:09:40Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"From: Robin Rosenberg <robin.rosenberg@dewire.com>\n\nSigned-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n\n Documentation/git-pull.txt |    2 +-\n Documentation/git.txt      |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 51577fc..2a5aea7 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -3,7 +3,7 @@ git-pull(1)\n \n NAME\n ----\n-git-pull - Pull and merge from another repository\n+git-pull - Pull and merge from another repository or a local branch\n \n \n SYNOPSIS\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 595cca1..fff07e1 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -324,7 +324,7 @@ gitlink:git-mv[1]::\n \tMove or rename a file, a directory, or a symlink.\n \n gitlink:git-pull[1]::\n-\tFetch from and merge with a remote repository.\n+\tFetch from and merge with a remote repository or a local branch.\n \n gitlink:git-push[1]::\n"},{"id":"297048","messageId":"20061029200948.11233.27482.stgit@lathund.dewire.com","threadId":"43451","inReplyTo":"20061029200940.11233.20277.stgit@lathund.dewire.com","subject":"[PATCH 2/2] Swap the porcelain and plumbing commands in the git man page","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg@dewire.com","sentAt":"2006-10-29T20:09:48Z","receivedAt":"2006-10-29T20:09:48Z","isPatch":true,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"From: Robin Rosenberg <robin.rosenberg@dewire.com>\n\nThis makes the documentation less confusing to newcomers.\n\nSigned-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>\n---\n\n Documentation/git.txt |  364 +++++++++++++++++++++++++------------------------\n 1 files changed, 182 insertions(+), 182 deletions(-)\n\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex fff07e1..0679e3c 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -72,188 +72,6 @@ GIT COMMANDS\n We divide git into high level (\"porcelain\") commands and low level\n (\"plumbing\") commands.\n \n-Low-level commands (plumbing)\n------------------------------\n-\n-Although git includes its\n-own porcelain layer, its low-level commands are sufficient to support\n-development of alternative porcelains.  Developers of such porcelains\n-might start by reading about gitlink:git-update-index[1] and\n-gitlink:git-read-tree[1].\n-\n-We divide the low-level commands into commands that manipulate objects (in\n-the repository, index, and working tree), commands that interrogate and\n-compare objects, and commands that move objects and references between\n-repositories.\n-\n-Manipulation commands\n-~~~~~~~~~~~~~~~~~~~~~\n-gitlink:git-apply[1]::\n-\tReads a \"diff -up1\" or git generated patch file and\n-\tapplies it to the working tree.\n-\n-gitlink:git-checkout-index[1]::\n-\tCopy files from the index to the working tree.\n-\n-gitlink:git-commit-tree[1]::\n-\tCreates a new commit object.\n-\n-gitlink:git-hash-object[1]::\n-\tComputes the object ID from a file.\n-\n-gitlink:git-index-pack[1]::\n-\tBuild pack idx file for an existing packed archive.\n-\n-gitlink:git-init-db[1]::\n-\tCreates an empty git object database, or reinitialize an\n-\texisting one.\n-\n-gitlink:git-merge-index[1]::\n-\tRuns a merge for files needing merging.\n-\n-gitlink:git-mktag[1]::\n-\tCreates a tag object.\n-\n-gitlink:git-mktree[1]::\n-\tBuild a tree-object from ls-tree formatted text.\n-\n-gitlink:git-pack-objects[1]::\n-\tCreates a packed archive of objects.\n-\n-gitlink:git-prune-packed[1]::\n-\tRemove extra objects that are already in pack files.\n-\n-gitlink:git-read-tree[1]::\n-\tReads tree information into the index.\n-\n-gitlink:git-repo-config[1]::\n-\tGet and set options in .git/config.\n-\n-gitlink:git-unpack-objects[1]::\n-\tUnpacks objects out of a packed archive.\n-\n-gitlink:git-update-index[1]::\n-\tRegisters files in the working tree to the index.\n-\n-gitlink:git-write-tree[1]::\n-\tCreates a tree from the index.\n-\n-\n-Interrogation commands\n-~~~~~~~~~~~~~~~~~~~~~~\n-\n-gitlink:git-cat-file[1]::\n-\tProvide content or type/size information for repository objects.\n-\n-gitlink:git-describe[1]::\n-\tShow the most recent tag that is reachable from a commit.\n-\n-gitlink:git-diff-index[1]::\n-\tCompares content and mode of blobs between the index and repository.\n-\n-gitlink:git-diff-files[1]::\n-\tCompares files in the working tree and the index.\n-\n-gitlink:git-diff-stages[1]::\n-\tCompares two \"merge stages\" in the index.\n-\n-gitlink:git-diff-tree[1]::\n-\tCompares the content and mode of blobs found via two tree objects.\n-\n-gitlink:git-for-each-ref[1]::\n-\tOutput information on each ref.\n-\n-gitlink:git-fsck-objects[1]::\n-\tVerifies the connectivity and validity of the objects in the database.\n-\n-gitlink:git-ls-files[1]::\n-\tInformation about files in the index and the working tree.\n-\n-gitlink:git-ls-tree[1]::\n-\tDisplays a tree object in human readable form.\n-\n-gitlink:git-merge-base[1]::\n-\tFinds as good common ancestors as possible for a merge.\n-\n-gitlink:git-name-rev[1]::\n-\tFind symbolic names for given revs.\n-\n-gitlink:git-pack-redundant[1]::\n-\tFind redundant pack files.\n-\n-gitlink:git-rev-list[1]::\n-\tLists commit objects in reverse chronological order.\n-\n-gitlink:git-show-index[1]::\n-\tDisplays contents of a pack idx file.\n-\n-gitlink:git-tar-tree[1]::\n-\tCreates a tar archive of the files in the named tree object.\n-\n-gitlink:git-unpack-file[1]::\n-\tCreates a temporary file with a blob's contents.\n-\n-gitlink:git-var[1]::\n-\tDisplays a git logical variable.\n-\n-gitlink:git-verify-pack[1]::\n-\tValidates packed git archive files.\n-\n-In general, the interrogate commands do not touch the files in\n-the working tree.\n-\n-\n-Synching repositories\n-~~~~~~~~~~~~~~~~~~~~~\n-\n-gitlink:git-fetch-pack[1]::\n-\tUpdates from a remote repository (engine for ssh and\n-\tlocal transport).\n-\n-gitlink:git-http-fetch[1]::\n-\tDownloads a remote git repository via HTTP by walking\n-\tcommit chain.\n-\n-gitlink:git-local-fetch[1]::\n-\tDuplicates another git repository on a local system by\n-\twalking commit chain.\n-\n-gitlink:git-peek-remote[1]::\n-\tLists references on a remote repository using\n-\tupload-pack protocol (engine for ssh and local\n-\ttransport).\n-\n-gitlink:git-receive-pack[1]::\n-\tInvoked by 'git-send-pack' to receive what is pushed to it.\n-\n-gitlink:git-send-pack[1]::\n-\tPushes to a remote repository, intelligently.\n-\n-gitlink:git-http-push[1]::\n-\tPush missing objects using HTTP/DAV.\n-\n-gitlink:git-shell[1]::\n-\tRestricted shell for GIT-only SSH access.\n-\n-gitlink:git-ssh-fetch[1]::\n-\tPulls from a remote repository over ssh connection by\n-\twalking commit chain.\n-\n-gitlink:git-ssh-upload[1]::\n-\tHelper \"server-side\" program used by git-ssh-fetch.\n-\n-gitlink:git-update-server-info[1]::\n-\tUpdates auxiliary information on a dumb server to help\n-\tclients discover references and packs on it.\n-\n-gitlink:git-upload-archive[1]::\n-\tInvoked by 'git-archive' to send a generated archive.\n-\n-gitlink:git-upload-pack[1]::\n-\tInvoked by 'git-fetch-pack' to push\n-\twhat are asked for.\n-\n-\n High-level commands (porcelain)\n -------------------------------\n \n@@ -491,6 +309,188 @@ gitlink:git-stripspace[1]::\n \tFilter out empty lines.\n \n \n+Low-level commands (plumbing)\n+-----------------------------\n+\n+Although git includes its\n+own porcelain layer, its low-level commands are sufficient to support\n+development of alternative porcelains.  Developers of such porcelains\n+might start by reading about gitlink:git-update-index[1] and\n+gitlink:git-read-tree[1].\n+\n+We divide the low-level commands into commands that manipulate objects (in\n+the repository, index, and working tree), commands that interrogate and\n+compare objects, and commands that move objects and references between\n+repositories.\n+\n+Manipulation commands\n+~~~~~~~~~~~~~~~~~~~~~\n+gitlink:git-apply[1]::\n+\tReads a \"diff -up1\" or git generated patch file and\n+\tapplies it to the working tree.\n+\n+gitlink:git-checkout-index[1]::\n+\tCopy files from the index to the working tree.\n+\n+gitlink:git-commit-tree[1]::\n+\tCreates a new commit object.\n+\n+gitlink:git-hash-object[1]::\n+\tComputes the object ID from a file.\n+\n+gitlink:git-index-pack[1]::\n+\tBuild pack idx file for an existing packed archive.\n+\n+gitlink:git-init-db[1]::\n+\tCreates an empty git object database, or reinitialize an\n+\texisting one.\n+\n+gitlink:git-merge-index[1]::\n+\tRuns a merge for files needing merging.\n+\n+gitlink:git-mktag[1]::\n+\tCreates a tag object.\n+\n+gitlink:git-mktree[1]::\n+\tBuild a tree-object from ls-tree formatted text.\n+\n+gitlink:git-pack-objects[1]::\n+\tCreates a packed archive of objects.\n+\n+gitlink:git-prune-packed[1]::\n+\tRemove extra objects that are already in pack files.\n+\n+gitlink:git-read-tree[1]::\n+\tReads tree information into the index.\n+\n+gitlink:git-repo-config[1]::\n+\tGet and set options in .git/config.\n+\n+gitlink:git-unpack-objects[1]::\n+\tUnpacks objects out of a packed archive.\n+\n+gitlink:git-update-index[1]::\n+\tRegisters files in the working tree to the index.\n+\n+gitlink:git-write-tree[1]::\n+\tCreates a tree from the index.\n+\n+\n+Interrogation commands\n+~~~~~~~~~~~~~~~~~~~~~~\n+\n+gitlink:git-cat-file[1]::\n+\tProvide content or type/size information for repository objects.\n+\n+gitlink:git-describe[1]::\n+\tShow the most recent tag that is reachable from a commit.\n+\n+gitlink:git-diff-index[1]::\n+\tCompares content and mode of blobs between the index and repository.\n+\n+gitlink:git-diff-files[1]::\n+\tCompares files in the working tree and the index.\n+\n+gitlink:git-diff-stages[1]::\n+\tCompares two \"merge stages\" in the index.\n+\n+gitlink:git-diff-tree[1]::\n+\tCompares the content and mode of blobs found via two tree objects.\n+\n+gitlink:git-for-each-ref[1]::\n+\tOutput information on each ref.\n+\n+gitlink:git-fsck-objects[1]::\n+\tVerifies the connectivity and validity of the objects in the database.\n+\n+gitlink:git-ls-files[1]::\n+\tInformation about files in the index and the working tree.\n+\n+gitlink:git-ls-tree[1]::\n+\tDisplays a tree object in human readable form.\n+\n+gitlink:git-merge-base[1]::\n+\tFinds as good common ancestors as possible for a merge.\n+\n+gitlink:git-name-rev[1]::\n+\tFind symbolic names for given revs.\n+\n+gitlink:git-pack-redundant[1]::\n+\tFind redundant pack files.\n+\n+gitlink:git-rev-list[1]::\n+\tLists commit objects in reverse chronological order.\n+\n+gitlink:git-show-index[1]::\n+\tDisplays contents of a pack idx file.\n+\n+gitlink:git-tar-tree[1]::\n+\tCreates a tar archive of the files in the named tree object.\n+\n+gitlink:git-unpack-file[1]::\n+\tCreates a temporary file with a blob's contents.\n+\n+gitlink:git-var[1]::\n+\tDisplays a git logical variable.\n+\n+gitlink:git-verify-pack[1]::\n+\tValidates packed git archive files.\n+\n+In general, the interrogate commands do not touch the files in\n+the working tree.\n+\n+\n+Synching repositories\n+~~~~~~~~~~~~~~~~~~~~~\n+\n+gitlink:git-fetch-pack[1]::\n+\tUpdates from a remote repository (engine for ssh and\n+\tlocal transport).\n+\n+gitlink:git-http-fetch[1]::\n+\tDownloads a remote git repository via HTTP by walking\n+\tcommit chain.\n+\n+gitlink:git-local-fetch[1]::\n+\tDuplicates another git repository on a local system by\n+\twalking commit chain.\n+\n+gitlink:git-peek-remote[1]::\n+\tLists references on a remote repository using\n+\tupload-pack protocol (engine for ssh and local\n+\ttransport).\n+\n+gitlink:git-receive-pack[1]::\n+\tInvoked by 'git-send-pack' to receive what is pushed to it.\n+\n+gitlink:git-send-pack[1]::\n+\tPushes to a remote repository, intelligently.\n+\n+gitlink:git-http-push[1]::\n+\tPush missing objects using HTTP/DAV.\n+\n+gitlink:git-shell[1]::\n+\tRestricted shell for GIT-only SSH access.\n+\n+gitlink:git-ssh-fetch[1]::\n+\tPulls from a remote repository over ssh connection by\n+\twalking commit chain.\n+\n+gitlink:git-ssh-upload[1]::\n+\tHelper \"server-side\" program used by git-ssh-fetch.\n+\n+gitlink:git-update-server-info[1]::\n+\tUpdates auxiliary information on a dumb server to help\n+\tclients discover references and packs on it.\n+\n+gitlink:git-upload-archive[1]::\n+\tInvoked by 'git-archive' to send a generated archive.\n+\n+gitlink:git-upload-pack[1]::\n+\tInvoked by 'git-fetch-pack' to push\n+\twhat are asked for.\n+\n+\n Configuration Mechanism\n -----------------------\n"},{"id":"294847","messageId":"7v1woq26jk.fsf@assigned-by-dhcp.cox.net","threadId":"43451","inReplyTo":"20061029200948.11233.27482.stgit@lathund.dewire.com","subject":"Re: [PATCH 2/2] Swap the porcelain and plumbing commands in the git man page","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-29T20:47:27Z","receivedAt":"2006-10-29T20:47:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks for these two.  Applied.\n\nBy the way, people who run \"next\" may want to view:\n\n\tgit pickaxe -M v1.4.0.. -- Documentaiton/git.txt\n\nand marvel at Linus's genius ;-).\n"}]}