From b19b4f0f2e3316230172f636dc5ad4c300fff4e4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 Oct 2006 20:47:22 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.3.3-g6dcfa --- git-pull.html | 4 +- git-pull.txt | 2 +- git-send-email.html | 11 +- git-send-email.txt | 9 +- git.html | 572 ++++++++++++++++++++++---------------------- git.txt | 366 ++++++++++++++-------------- 6 files changed, 487 insertions(+), 477 deletions(-) diff --git a/git-pull.html b/git-pull.html index 70f714fb4..10171f38b 100644 --- a/git-pull.html +++ b/git-pull.html @@ -266,7 +266,7 @@ git-pull(1) Manual Page

NAME

git-pull - - Pull and merge from another repository + Pull and merge from another repository or a local branch

@@ -817,7 +817,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-pull.txt b/git-pull.txt index 51577fcbe..2a5aea73b 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -3,7 +3,7 @@ git-pull(1) NAME ---- -git-pull - Pull and merge from another repository +git-pull - Pull and merge from another repository or a local branch SYNOPSIS diff --git a/git-send-email.html b/git-send-email.html index 0a35b9193..8ca40b4a3 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -375,8 +375,13 @@ enabled interface to provide the necessary information.

- If set, specifies the outgoing SMTP server to use. Defaults to - localhost. + If set, specifies the outgoing SMTP server to use. A full + pathname of a sendmail-like program can be specified instead; + the program must support the -i option. Default value can + be specified by the sendemail.smtpserver configuration + option; the built-in default is /usr/sbin/sendmail or + /usr/lib/sendmail if such program is available, or + localhost otherwise.

@@ -430,7 +435,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 481b3f50e..4c8d907bd 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -66,8 +66,13 @@ The options available are: all that is output. --smtp-server:: - If set, specifies the outgoing SMTP server to use. Defaults to - localhost. + If set, specifies the outgoing SMTP server to use. A full + pathname of a sendmail-like program can be specified instead; + the program must support the `-i` option. Default value can + be specified by the 'sendemail.smtpserver' configuration + option; the built-in default is `/usr/sbin/sendmail` or + `/usr/lib/sendmail` if such program is available, or + `localhost` otherwise. --subject:: Specify the initial subject of the email thread. diff --git a/git.html b/git.html index b16a005d1..e65d621b8 100644 --- a/git.html +++ b/git.html @@ -363,1013 +363,1013 @@ examples.

We divide git into high level ("porcelain") commands and low level ("plumbing") commands.

-

Low-level commands (plumbing)

+

High-level commands (porcelain)

-

Although git includes its -own porcelain layer, its low-level commands are sufficient to support -development of alternative porcelains. Developers of such porcelains -might start by reading about git-update-index(1) and -git-read-tree(1).

-

We divide the low-level commands into commands that manipulate objects (in -the repository, index, and working tree), commands that interrogate and -compare objects, and commands that move objects and references between -repositories.

-

Manipulation commands

+

We separate the porcelain commands into the main commands and some +ancillary user utilities.

+

Main porcelain commands

-git-apply(1) +git-add(1)

- Reads a "diff -up1" or git generated patch file and - applies it to the working tree. + Add paths to the index.

-git-checkout-index(1) +git-am(1)

- Copy files from the index to the working tree. + Apply patches from a mailbox, but cooler.

-git-commit-tree(1) +git-applymbox(1)

- Creates a new commit object. + Apply patches from a mailbox, original version by Linus.

-git-hash-object(1) +git-archive(1)

- Computes the object ID from a file. + Creates an archive of files from a named tree.

-git-index-pack(1) +git-bisect(1)

- Build pack idx file for an existing packed archive. + Find the change that introduced a bug by binary search.

-git-init-db(1) +git-branch(1)

- Creates an empty git object database, or reinitialize an - existing one. + Create and Show branches.

-git-merge-index(1) +git-checkout(1)

- Runs a merge for files needing merging. + Checkout and switch to a branch.

-git-mktag(1) +git-cherry-pick(1)

- Creates a tag object. + Cherry-pick the effect of an existing commit.

-git-mktree(1) +git-clean(1)

- Build a tree-object from ls-tree formatted text. + Remove untracked files from the working tree.

-git-pack-objects(1) +git-clone(1)

- Creates a packed archive of objects. + Clones a repository into a new directory.

-git-prune-packed(1) +git-commit(1)

- Remove extra objects that are already in pack files. + Record changes to the repository.

-git-read-tree(1) +git-diff(1)

- Reads tree information into the index. + Show changes between commits, commit and working tree, etc.

-git-repo-config(1) +git-fetch(1)

- Get and set options in .git/config. + Download from a remote repository via various protocols.

-git-unpack-objects(1) +git-format-patch(1)

- Unpacks objects out of a packed archive. + Prepare patches for e-mail submission.

-git-update-index(1) +git-grep(1)

- Registers files in the working tree to the index. + Print lines matching a pattern.

-git-write-tree(1) +gitk(1)

- Creates a tree from the index. + The git repository browser.

-
-

Interrogation commands

-
-git-cat-file(1) +git-log(1)

- Provide content or type/size information for repository objects. + Shows commit logs.

-git-describe(1) +git-ls-remote(1)

- Show the most recent tag that is reachable from a commit. + Shows references in a remote or local repository.

-git-diff-index(1) +git-merge(1)

- Compares content and mode of blobs between the index and repository. + Grand unified merge driver.

-git-diff-files(1) +git-mv(1)

- Compares files in the working tree and the index. + Move or rename a file, a directory, or a symlink.

-git-diff-stages(1) +git-pull(1)

- Compares two "merge stages" in the index. + Fetch from and merge with a remote repository or a local branch.

-git-diff-tree(1) +git-push(1)

- Compares the content and mode of blobs found via two tree objects. + Update remote refs along with associated objects.

-git-for-each-ref(1) +git-rebase(1)

- Output information on each ref. + Rebase local commits to the updated upstream head.

-git-fsck-objects(1) +git-repack(1)

- Verifies the connectivity and validity of the objects in the database. + Pack unpacked objects in a repository.

-git-ls-files(1) +git-rerere(1)

- Information about files in the index and the working tree. + Reuse recorded resolution of conflicted merges.

-git-ls-tree(1) +git-reset(1)

- Displays a tree object in human readable form. + Reset current HEAD to the specified state.

-git-merge-base(1) +git-resolve(1)

- Finds as good common ancestors as possible for a merge. + Merge two commits.

-git-name-rev(1) +git-revert(1)

- Find symbolic names for given revs. + Revert an existing commit.

-git-pack-redundant(1) +git-rm(1)

- Find redundant pack files. + Remove files from the working tree and from the index.

-git-rev-list(1) +git-shortlog(1)

- Lists commit objects in reverse chronological order. + Summarizes git log output.

-git-show-index(1) +git-show(1)

- Displays contents of a pack idx file. + Show one commit log and its diff.

-git-tar-tree(1) +git-show-branch(1)

- Creates a tar archive of the files in the named tree object. + Show branches and their commits.

-git-unpack-file(1) +git-status(1)

- Creates a temporary file with a blob's contents. + Shows the working tree status.

-git-var(1) +git-verify-tag(1)

- Displays a git logical variable. + Check the GPG signature of tag.

-git-verify-pack(1) +git-whatchanged(1)

- Validates packed git archive files. + Shows commit logs and differences they introduce.

-

In general, the interrogate commands do not touch the files in -the working tree.

-

Synching repositories

+

Ancillary Commands

+

Manipulators:

-git-fetch-pack(1) +git-applypatch(1)

- Updates from a remote repository (engine for ssh and - local transport). + Apply one patch extracted from an e-mail.

-git-http-fetch(1) +git-archimport(1)

- Downloads a remote git repository via HTTP by walking - commit chain. + Import an arch repository into git.

-git-local-fetch(1) +git-convert-objects(1)

- Duplicates another git repository on a local system by - walking commit chain. + Converts old-style git repository.

-git-peek-remote(1) +git-cvsimport(1)

- Lists references on a remote repository using - upload-pack protocol (engine for ssh and local - transport). + Salvage your data out of another SCM people love to hate.

-git-receive-pack(1) +git-cvsexportcommit(1)

- Invoked by git-send-pack to receive what is pushed to it. + Export a single commit to a CVS checkout.

-git-send-pack(1) +git-cvsserver(1)

- Pushes to a remote repository, intelligently. + A CVS server emulator for git.

-git-http-push(1) +git-lost-found(1)

- Push missing objects using HTTP/DAV. + Recover lost refs that luckily have not yet been pruned.

-git-shell(1) +git-merge-one-file(1)

- Restricted shell for GIT-only SSH access. + The standard helper program to use with git-merge-index.

-git-ssh-fetch(1) +git-prune(1)

- Pulls from a remote repository over ssh connection by - walking commit chain. + Prunes all unreachable objects from the object database.

-git-ssh-upload(1) +git-quiltimport(1)

- Helper "server-side" program used by git-ssh-fetch. + Applies a quilt patchset onto the current branch.

-git-update-server-info(1) +git-relink(1)

- Updates auxiliary information on a dumb server to help - clients discover references and packs on it. + Hardlink common objects in local repositories.

-git-upload-archive(1) +git-svn(1)

- Invoked by git-archive to send a generated archive. + Bidirectional operation between a single Subversion branch and git.

-git-upload-pack(1) +git-svnimport(1)

- Invoked by git-fetch-pack to push - what are asked for. + Import a SVN repository into git.

-
-
-

High-level commands (porcelain)

-
-

We separate the porcelain commands into the main commands and some -ancillary user utilities.

-

Main porcelain commands

-
-git-add(1) +git-sh-setup(1)

- Add paths to the index. + Common git shell script setup code.

-git-am(1) +git-symbolic-ref(1)

- Apply patches from a mailbox, but cooler. + Read and modify symbolic refs.

-git-applymbox(1) +git-tag(1)

- Apply patches from a mailbox, original version by Linus. + An example script to create a tag object signed with GPG.

-git-archive(1) +git-update-ref(1)

- Creates an archive of files from a named tree. + Update the object name stored in a ref safely.

+
+

Interrogators:

+
-git-bisect(1) +git-annotate(1)

- Find the change that introduced a bug by binary search. + Annotate file lines with commit info.

-git-branch(1) +git-blame(1)

- Create and Show branches. + Blame file lines on commits.

-git-checkout(1) +git-check-ref-format(1)

- Checkout and switch to a branch. + Make sure ref name is well formed.

-git-cherry-pick(1) +git-cherry(1)

- Cherry-pick the effect of an existing commit. + Find commits not merged upstream.

-git-clean(1) +git-count-objects(1)

- Remove untracked files from the working tree. + Count unpacked number of objects and their disk consumption.

-git-clone(1) +git-daemon(1)

- Clones a repository into a new directory. + A really simple server for git repositories.

-git-commit(1) +git-fmt-merge-msg(1)

- Record changes to the repository. + Produce a merge commit message.

-git-diff(1) +git-get-tar-commit-id(1)

- Show changes between commits, commit and working tree, etc. + Extract commit ID from an archive created using git-tar-tree.

-git-fetch(1) +git-imap-send(1)

- Download from a remote repository via various protocols. + Dump a mailbox from stdin into an imap folder.

-git-format-patch(1) +git-instaweb(1)

- Prepare patches for e-mail submission. + Instantly browse your working repository in gitweb.

-git-grep(1) +git-mailinfo(1)

- Print lines matching a pattern. + Extracts patch and authorship information from a single + e-mail message, optionally transliterating the commit + message into utf-8.

-gitk(1) +git-mailsplit(1)

- The git repository browser. + A stupid program to split UNIX mbox format mailbox into + individual pieces of e-mail.

-git-log(1) +git-merge-tree(1)

- Shows commit logs. + Show three-way merge without touching index.

-git-ls-remote(1) +git-patch-id(1)

- Shows references in a remote or local repository. + Compute unique ID for a patch.

-git-merge(1) +git-parse-remote(1)

- Grand unified merge driver. + Routines to help parsing $GIT_DIR/remotes/ files.

-git-mv(1) +git-request-pull(1)

- Move or rename a file, a directory, or a symlink. + git-request-pull.

-git-pull(1) +git-rev-parse(1)

- Fetch from and merge with a remote repository. + Pick out and massage parameters.

-git-push(1) +git-send-email(1)

- Update remote refs along with associated objects. + Send patch e-mails out of "format-patch --mbox" output.

-git-rebase(1) +git-symbolic-ref(1)

- Rebase local commits to the updated upstream head. + Read and modify symbolic refs.

-git-repack(1) +git-stripspace(1)

- Pack unpacked objects in a repository. + Filter out empty lines.

+
+
+

Low-level commands (plumbing)

+
+

Although git includes its +own porcelain layer, its low-level commands are sufficient to support +development of alternative porcelains. Developers of such porcelains +might start by reading about git-update-index(1) and +git-read-tree(1).

+

We divide the low-level commands into commands that manipulate objects (in +the repository, index, and working tree), commands that interrogate and +compare objects, and commands that move objects and references between +repositories.

+

Manipulation commands

+
-git-rerere(1) +git-apply(1)

- Reuse recorded resolution of conflicted merges. + Reads a "diff -up1" or git generated patch file and + applies it to the working tree.

-git-reset(1) +git-checkout-index(1)

- Reset current HEAD to the specified state. + Copy files from the index to the working tree.

-git-resolve(1) +git-commit-tree(1)

- Merge two commits. + Creates a new commit object.

-git-revert(1) +git-hash-object(1)

- Revert an existing commit. + Computes the object ID from a file.

-git-rm(1) +git-index-pack(1)

- Remove files from the working tree and from the index. + Build pack idx file for an existing packed archive.

-git-shortlog(1) +git-init-db(1)

- Summarizes git log output. + Creates an empty git object database, or reinitialize an + existing one.

-git-show(1) +git-merge-index(1)

- Show one commit log and its diff. + Runs a merge for files needing merging.

-git-show-branch(1) +git-mktag(1)

- Show branches and their commits. + Creates a tag object.

-git-status(1) +git-mktree(1)

- Shows the working tree status. + Build a tree-object from ls-tree formatted text.

-git-verify-tag(1) +git-pack-objects(1)

- Check the GPG signature of tag. + Creates a packed archive of objects.

-git-whatchanged(1) +git-prune-packed(1)

- Shows commit logs and differences they introduce. + Remove extra objects that are already in pack files.

-
-

Ancillary Commands

-

Manipulators:

-
-git-applypatch(1) +git-read-tree(1)

- Apply one patch extracted from an e-mail. + Reads tree information into the index.

-git-archimport(1) +git-repo-config(1)

- Import an arch repository into git. + Get and set options in .git/config.

-git-convert-objects(1) +git-unpack-objects(1)

- Converts old-style git repository. + Unpacks objects out of a packed archive.

-git-cvsimport(1) +git-update-index(1)

- Salvage your data out of another SCM people love to hate. + Registers files in the working tree to the index.

-git-cvsexportcommit(1) +git-write-tree(1)

- Export a single commit to a CVS checkout. + Creates a tree from the index.

+
+

Interrogation commands

+
-git-cvsserver(1) +git-cat-file(1)

- A CVS server emulator for git. + Provide content or type/size information for repository objects.

-git-lost-found(1) +git-describe(1)

- Recover lost refs that luckily have not yet been pruned. + Show the most recent tag that is reachable from a commit.

-git-merge-one-file(1) +git-diff-index(1)

- The standard helper program to use with git-merge-index. + Compares content and mode of blobs between the index and repository.

-git-prune(1) +git-diff-files(1)

- Prunes all unreachable objects from the object database. + Compares files in the working tree and the index.

-git-quiltimport(1) +git-diff-stages(1)

- Applies a quilt patchset onto the current branch. + Compares two "merge stages" in the index.

-git-relink(1) +git-diff-tree(1)

- Hardlink common objects in local repositories. + Compares the content and mode of blobs found via two tree objects.

-git-svn(1) +git-for-each-ref(1)

- Bidirectional operation between a single Subversion branch and git. + Output information on each ref.

-git-svnimport(1) +git-fsck-objects(1)

- Import a SVN repository into git. + Verifies the connectivity and validity of the objects in the database.

-git-sh-setup(1) +git-ls-files(1)

- Common git shell script setup code. + Information about files in the index and the working tree.

-git-symbolic-ref(1) +git-ls-tree(1)

- Read and modify symbolic refs. + Displays a tree object in human readable form.

-git-tag(1) +git-merge-base(1)

- An example script to create a tag object signed with GPG. + Finds as good common ancestors as possible for a merge.

-git-update-ref(1) +git-name-rev(1)

- Update the object name stored in a ref safely. + Find symbolic names for given revs.

-
-

Interrogators:

-
-git-annotate(1) +git-pack-redundant(1)

- Annotate file lines with commit info. + Find redundant pack files.

-git-blame(1) +git-rev-list(1)

- Blame file lines on commits. + Lists commit objects in reverse chronological order.

-git-check-ref-format(1) +git-show-index(1)

- Make sure ref name is well formed. + Displays contents of a pack idx file.

-git-cherry(1) +git-tar-tree(1)

- Find commits not merged upstream. + Creates a tar archive of the files in the named tree object.

-git-count-objects(1) +git-unpack-file(1)

- Count unpacked number of objects and their disk consumption. + Creates a temporary file with a blob's contents.

-git-daemon(1) +git-var(1)

- A really simple server for git repositories. + Displays a git logical variable.

-git-fmt-merge-msg(1) +git-verify-pack(1)

- Produce a merge commit message. + Validates packed git archive files.

+
+

In general, the interrogate commands do not touch the files in +the working tree.

+

Synching repositories

+
-git-get-tar-commit-id(1) +git-fetch-pack(1)

- Extract commit ID from an archive created using git-tar-tree. + Updates from a remote repository (engine for ssh and + local transport).

-git-imap-send(1) +git-http-fetch(1)

- Dump a mailbox from stdin into an imap folder. + Downloads a remote git repository via HTTP by walking + commit chain.

-git-instaweb(1) +git-local-fetch(1)

- Instantly browse your working repository in gitweb. + Duplicates another git repository on a local system by + walking commit chain.

-git-mailinfo(1) +git-peek-remote(1)

- Extracts patch and authorship information from a single - e-mail message, optionally transliterating the commit - message into utf-8. + Lists references on a remote repository using + upload-pack protocol (engine for ssh and local + transport).

-git-mailsplit(1) +git-receive-pack(1)

- A stupid program to split UNIX mbox format mailbox into - individual pieces of e-mail. + Invoked by git-send-pack to receive what is pushed to it.

-git-merge-tree(1) +git-send-pack(1)

- Show three-way merge without touching index. + Pushes to a remote repository, intelligently.

-git-patch-id(1) +git-http-push(1)

- Compute unique ID for a patch. + Push missing objects using HTTP/DAV.

-git-parse-remote(1) +git-shell(1)

- Routines to help parsing $GIT_DIR/remotes/ files. + Restricted shell for GIT-only SSH access.

-git-request-pull(1) +git-ssh-fetch(1)

- git-request-pull. + Pulls from a remote repository over ssh connection by + walking commit chain.

-git-rev-parse(1) +git-ssh-upload(1)

- Pick out and massage parameters. + Helper "server-side" program used by git-ssh-fetch.

-git-send-email(1) +git-update-server-info(1)

- Send patch e-mails out of "format-patch --mbox" output. + Updates auxiliary information on a dumb server to help + clients discover references and packs on it.

-git-symbolic-ref(1) +git-upload-archive(1)

- Read and modify symbolic refs. + Invoked by git-archive to send a generated archive.

-git-stripspace(1) +git-upload-pack(1)

- Filter out empty lines. + Invoked by git-fetch-pack to push + what are asked for.

@@ -2190,7 +2190,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 595cca1ef..0679e3c20 100644 --- a/git.txt +++ b/git.txt @@ -72,188 +72,6 @@ GIT COMMANDS We divide git into high level ("porcelain") commands and low level ("plumbing") commands. -Low-level commands (plumbing) ------------------------------ - -Although git includes its -own porcelain layer, its low-level commands are sufficient to support -development of alternative porcelains. Developers of such porcelains -might start by reading about gitlink:git-update-index[1] and -gitlink:git-read-tree[1]. - -We divide the low-level commands into commands that manipulate objects (in -the repository, index, and working tree), commands that interrogate and -compare objects, and commands that move objects and references between -repositories. - -Manipulation commands -~~~~~~~~~~~~~~~~~~~~~ -gitlink:git-apply[1]:: - Reads a "diff -up1" or git generated patch file and - applies it to the working tree. - -gitlink:git-checkout-index[1]:: - Copy files from the index to the working tree. - -gitlink:git-commit-tree[1]:: - Creates a new commit object. - -gitlink:git-hash-object[1]:: - Computes the object ID from a file. - -gitlink:git-index-pack[1]:: - Build pack idx file for an existing packed archive. - -gitlink:git-init-db[1]:: - Creates an empty git object database, or reinitialize an - existing one. - -gitlink:git-merge-index[1]:: - Runs a merge for files needing merging. - -gitlink:git-mktag[1]:: - Creates a tag object. - -gitlink:git-mktree[1]:: - Build a tree-object from ls-tree formatted text. - -gitlink:git-pack-objects[1]:: - Creates a packed archive of objects. - -gitlink:git-prune-packed[1]:: - Remove extra objects that are already in pack files. - -gitlink:git-read-tree[1]:: - Reads tree information into the index. - -gitlink:git-repo-config[1]:: - Get and set options in .git/config. - -gitlink:git-unpack-objects[1]:: - Unpacks objects out of a packed archive. - -gitlink:git-update-index[1]:: - Registers files in the working tree to the index. - -gitlink:git-write-tree[1]:: - Creates a tree from the index. - - -Interrogation commands -~~~~~~~~~~~~~~~~~~~~~~ - -gitlink:git-cat-file[1]:: - Provide content or type/size information for repository objects. - -gitlink:git-describe[1]:: - Show the most recent tag that is reachable from a commit. - -gitlink:git-diff-index[1]:: - Compares content and mode of blobs between the index and repository. - -gitlink:git-diff-files[1]:: - Compares files in the working tree and the index. - -gitlink:git-diff-stages[1]:: - Compares two "merge stages" in the index. - -gitlink:git-diff-tree[1]:: - Compares the content and mode of blobs found via two tree objects. - -gitlink:git-for-each-ref[1]:: - Output information on each ref. - -gitlink:git-fsck-objects[1]:: - Verifies the connectivity and validity of the objects in the database. - -gitlink:git-ls-files[1]:: - Information about files in the index and the working tree. - -gitlink:git-ls-tree[1]:: - Displays a tree object in human readable form. - -gitlink:git-merge-base[1]:: - Finds as good common ancestors as possible for a merge. - -gitlink:git-name-rev[1]:: - Find symbolic names for given revs. - -gitlink:git-pack-redundant[1]:: - Find redundant pack files. - -gitlink:git-rev-list[1]:: - Lists commit objects in reverse chronological order. - -gitlink:git-show-index[1]:: - Displays contents of a pack idx file. - -gitlink:git-tar-tree[1]:: - Creates a tar archive of the files in the named tree object. - -gitlink:git-unpack-file[1]:: - Creates a temporary file with a blob's contents. - -gitlink:git-var[1]:: - Displays a git logical variable. - -gitlink:git-verify-pack[1]:: - Validates packed git archive files. - -In general, the interrogate commands do not touch the files in -the working tree. - - -Synching repositories -~~~~~~~~~~~~~~~~~~~~~ - -gitlink:git-fetch-pack[1]:: - Updates from a remote repository (engine for ssh and - local transport). - -gitlink:git-http-fetch[1]:: - Downloads a remote git repository via HTTP by walking - commit chain. - -gitlink:git-local-fetch[1]:: - Duplicates another git repository on a local system by - walking commit chain. - -gitlink:git-peek-remote[1]:: - Lists references on a remote repository using - upload-pack protocol (engine for ssh and local - transport). - -gitlink:git-receive-pack[1]:: - Invoked by 'git-send-pack' to receive what is pushed to it. - -gitlink:git-send-pack[1]:: - Pushes to a remote repository, intelligently. - -gitlink:git-http-push[1]:: - Push missing objects using HTTP/DAV. - -gitlink:git-shell[1]:: - Restricted shell for GIT-only SSH access. - -gitlink:git-ssh-fetch[1]:: - Pulls from a remote repository over ssh connection by - walking commit chain. - -gitlink:git-ssh-upload[1]:: - Helper "server-side" program used by git-ssh-fetch. - -gitlink:git-update-server-info[1]:: - Updates auxiliary information on a dumb server to help - clients discover references and packs on it. - -gitlink:git-upload-archive[1]:: - Invoked by 'git-archive' to send a generated archive. - -gitlink:git-upload-pack[1]:: - Invoked by 'git-fetch-pack' to push - what are asked for. - - High-level commands (porcelain) ------------------------------- @@ -324,7 +142,7 @@ gitlink:git-mv[1]:: Move or rename a file, a directory, or a symlink. gitlink:git-pull[1]:: - Fetch from and merge with a remote repository. + Fetch from and merge with a remote repository or a local branch. gitlink:git-push[1]:: Update remote refs along with associated objects. @@ -491,6 +309,188 @@ gitlink:git-stripspace[1]:: Filter out empty lines. +Low-level commands (plumbing) +----------------------------- + +Although git includes its +own porcelain layer, its low-level commands are sufficient to support +development of alternative porcelains. Developers of such porcelains +might start by reading about gitlink:git-update-index[1] and +gitlink:git-read-tree[1]. + +We divide the low-level commands into commands that manipulate objects (in +the repository, index, and working tree), commands that interrogate and +compare objects, and commands that move objects and references between +repositories. + +Manipulation commands +~~~~~~~~~~~~~~~~~~~~~ +gitlink:git-apply[1]:: + Reads a "diff -up1" or git generated patch file and + applies it to the working tree. + +gitlink:git-checkout-index[1]:: + Copy files from the index to the working tree. + +gitlink:git-commit-tree[1]:: + Creates a new commit object. + +gitlink:git-hash-object[1]:: + Computes the object ID from a file. + +gitlink:git-index-pack[1]:: + Build pack idx file for an existing packed archive. + +gitlink:git-init-db[1]:: + Creates an empty git object database, or reinitialize an + existing one. + +gitlink:git-merge-index[1]:: + Runs a merge for files needing merging. + +gitlink:git-mktag[1]:: + Creates a tag object. + +gitlink:git-mktree[1]:: + Build a tree-object from ls-tree formatted text. + +gitlink:git-pack-objects[1]:: + Creates a packed archive of objects. + +gitlink:git-prune-packed[1]:: + Remove extra objects that are already in pack files. + +gitlink:git-read-tree[1]:: + Reads tree information into the index. + +gitlink:git-repo-config[1]:: + Get and set options in .git/config. + +gitlink:git-unpack-objects[1]:: + Unpacks objects out of a packed archive. + +gitlink:git-update-index[1]:: + Registers files in the working tree to the index. + +gitlink:git-write-tree[1]:: + Creates a tree from the index. + + +Interrogation commands +~~~~~~~~~~~~~~~~~~~~~~ + +gitlink:git-cat-file[1]:: + Provide content or type/size information for repository objects. + +gitlink:git-describe[1]:: + Show the most recent tag that is reachable from a commit. + +gitlink:git-diff-index[1]:: + Compares content and mode of blobs between the index and repository. + +gitlink:git-diff-files[1]:: + Compares files in the working tree and the index. + +gitlink:git-diff-stages[1]:: + Compares two "merge stages" in the index. + +gitlink:git-diff-tree[1]:: + Compares the content and mode of blobs found via two tree objects. + +gitlink:git-for-each-ref[1]:: + Output information on each ref. + +gitlink:git-fsck-objects[1]:: + Verifies the connectivity and validity of the objects in the database. + +gitlink:git-ls-files[1]:: + Information about files in the index and the working tree. + +gitlink:git-ls-tree[1]:: + Displays a tree object in human readable form. + +gitlink:git-merge-base[1]:: + Finds as good common ancestors as possible for a merge. + +gitlink:git-name-rev[1]:: + Find symbolic names for given revs. + +gitlink:git-pack-redundant[1]:: + Find redundant pack files. + +gitlink:git-rev-list[1]:: + Lists commit objects in reverse chronological order. + +gitlink:git-show-index[1]:: + Displays contents of a pack idx file. + +gitlink:git-tar-tree[1]:: + Creates a tar archive of the files in the named tree object. + +gitlink:git-unpack-file[1]:: + Creates a temporary file with a blob's contents. + +gitlink:git-var[1]:: + Displays a git logical variable. + +gitlink:git-verify-pack[1]:: + Validates packed git archive files. + +In general, the interrogate commands do not touch the files in +the working tree. + + +Synching repositories +~~~~~~~~~~~~~~~~~~~~~ + +gitlink:git-fetch-pack[1]:: + Updates from a remote repository (engine for ssh and + local transport). + +gitlink:git-http-fetch[1]:: + Downloads a remote git repository via HTTP by walking + commit chain. + +gitlink:git-local-fetch[1]:: + Duplicates another git repository on a local system by + walking commit chain. + +gitlink:git-peek-remote[1]:: + Lists references on a remote repository using + upload-pack protocol (engine for ssh and local + transport). + +gitlink:git-receive-pack[1]:: + Invoked by 'git-send-pack' to receive what is pushed to it. + +gitlink:git-send-pack[1]:: + Pushes to a remote repository, intelligently. + +gitlink:git-http-push[1]:: + Push missing objects using HTTP/DAV. + +gitlink:git-shell[1]:: + Restricted shell for GIT-only SSH access. + +gitlink:git-ssh-fetch[1]:: + Pulls from a remote repository over ssh connection by + walking commit chain. + +gitlink:git-ssh-upload[1]:: + Helper "server-side" program used by git-ssh-fetch. + +gitlink:git-update-server-info[1]:: + Updates auxiliary information on a dumb server to help + clients discover references and packs on it. + +gitlink:git-upload-archive[1]:: + Invoked by 'git-archive' to send a generated archive. + +gitlink:git-upload-pack[1]:: + Invoked by 'git-fetch-pack' to push + what are asked for. + + Configuration Mechanism ----------------------- -- 2.26.2