From: Junio C Hamano Date: Sat, 20 Jan 2007 02:22:50 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc1-g6f71 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ad294bce02ce66a5fa0a3aba3267d83fc995773;p=git.git Autogenerated HTML docs for v1.5.0-rc1-g6f71 --- diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt index 7398348d1..f5fef71c4 100644 --- a/cmds-ancillaryinterrogators.txt +++ b/cmds-ancillaryinterrogators.txt @@ -1,50 +1,32 @@ gitlink:git-annotate[1]:: Annotate file lines with commit info. +gitlink:git-applymbox[1]:: + Apply a series of patches in a mailbox. + gitlink:git-blame[1]:: Show what revision and author last modified each line of a file. -gitlink:git-check-ref-format[1]:: - Make sure ref name is well formed. - gitlink:git-cherry[1]:: Find commits not merged upstream. gitlink:git-count-objects[1]:: Count unpacked number of objects and their disk consumption. -gitlink:git-daemon[1]:: - A really simple server for git repositories. - -gitlink:git-fmt-merge-msg[1]:: - Produce a merge commit message. +gitlink:git-fsck-objects[1]:: + Verifies the connectivity and validity of the objects in the database. gitlink:git-get-tar-commit-id[1]:: Extract commit ID from an archive created using git-tar-tree. -gitlink:git-imap-send[1]:: - Dump a mailbox from stdin into an imap folder. - gitlink:git-instaweb[1]:: Instantly browse your working repository in gitweb. -gitlink:git-mailinfo[1]:: - Extracts patch and authorship from a single e-mail message. - -gitlink:git-mailsplit[1]:: - Simple UNIX mbox splitter program. - gitlink:git-merge-tree[1]:: Show three-way merge without touching index. -gitlink:git-parse-remote[1]:: - Routines to help parsing remote repository access parameters. - -gitlink:git-patch-id[1]:: - Compute unique ID for a patch. - -gitlink:git-request-pull[1]:: - Generates a summary of pending changes. +gitlink:git-rerere[1]:: + Reuse recorded resolution of conflicted merges. gitlink:git-rev-parse[1]:: Pick out and massage parameters. @@ -52,12 +34,12 @@ gitlink:git-rev-parse[1]:: gitlink:git-runstatus[1]:: A helper for git-status and git-commit. -gitlink:git-send-email[1]:: - Send a collection of patches as emails. +gitlink:git-show-branch[1]:: + Show branches and their commits. -gitlink:git-stripspace[1]:: - Filter out empty lines. +gitlink:git-verify-tag[1]:: + Check the GPG signature of tag. -gitlink:git-symbolic-ref[1]:: - Read and modify symbolic refs. +gitlink:git-whatchanged[1]:: + Show logs with difference each commit introduces. diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt index 638a132ae..993482c63 100644 --- a/cmds-ancillarymanipulators.txt +++ b/cmds-ancillarymanipulators.txt @@ -1,57 +1,24 @@ -gitlink:git-applypatch[1]:: - Apply one patch extracted from an e-mail. - -gitlink:git-archimport[1]:: - Import an Arch repository into git. - gitlink:git-convert-objects[1]:: Converts old-style git repository. -gitlink:git-cvsexportcommit[1]:: - Export a single commit to a CVS checkout. - -gitlink:git-cvsimport[1]:: - Salvage your data out of another SCM people love to hate. - -gitlink:git-cvsserver[1]:: - A CVS server emulator for git. - -gitlink:git-gc[1]:: - Cleanup unnecessary files and optimize the local repository. - gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. -gitlink:git-merge-one-file[1]:: - The standard helper program to use with git-merge-index. +gitlink:git-pack-refs[1]:: + Pack heads and tags for efficient repository access. gitlink:git-prune[1]:: Prunes all unreachable objects from the object database. -gitlink:git-quiltimport[1]:: - Applies a quilt patchset onto the current branch. - gitlink:git-reflog[1]:: Manage reflog information. gitlink:git-relink[1]:: Hardlink common objects in local repositories. -gitlink:git-sh-setup[1]:: - Common git shell script setup code. - -gitlink:git-svn[1]:: - Bidirectional operation between a single Subversion branch and git. - -gitlink:git-svnimport[1]:: - Import a SVN repository into git. - -gitlink:git-symbolic-ref[1]:: - Read and modify symbolic refs. - -gitlink:git-tag[1]:: - Create or verify a tag object signed with GPG. +gitlink:git-repack[1]:: + Pack unpacked objects in a repository. -gitlink:git-update-ref[1]:: - Update the object name stored in a ref safely. +gitlink:git-repo-config[1]:: + Get and set repository or global options. diff --git a/cmds-foreignscminterface.txt b/cmds-foreignscminterface.txt new file mode 100644 index 000000000..8880bb9db --- /dev/null +++ b/cmds-foreignscminterface.txt @@ -0,0 +1,30 @@ +gitlink:git-archimport[1]:: + Import an Arch repository into git. + +gitlink:git-cvsexportcommit[1]:: + Export a single commit to a CVS checkout. + +gitlink:git-cvsimport[1]:: + Salvage your data out of another SCM people love to hate. + +gitlink:git-cvsserver[1]:: + A CVS server emulator for git. + +gitlink:git-imap-send[1]:: + Dump a mailbox from stdin into an imap folder. + +gitlink:git-quiltimport[1]:: + Applies a quilt patchset onto the current branch. + +gitlink:git-request-pull[1]:: + Generates a summary of pending changes. + +gitlink:git-send-email[1]:: + Send a collection of patches as emails. + +gitlink:git-svn[1]:: + Bidirectional operation between a single Subversion branch and git. + +gitlink:git-svnimport[1]:: + Import a SVN repository into git. + diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index 05c5965dc..8184653ba 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt @@ -4,9 +4,6 @@ gitlink:git-add[1]:: gitlink:git-am[1]:: Apply a series of patches from a mailbox. -gitlink:git-applymbox[1]:: - Apply a series of patches in a mailbox. - gitlink:git-archive[1]:: Creates an archive of files from a named tree. @@ -31,6 +28,9 @@ gitlink:git-clone[1]:: gitlink:git-commit[1]:: Record changes to the repository. +gitlink:git-describe[1]:: + Show the most recent tag that is reachable from a commit. + gitlink:git-diff[1]:: Show changes between commits, commit and working tree, etc. @@ -40,27 +40,27 @@ gitlink:git-fetch[1]:: gitlink:git-format-patch[1]:: Prepare patches for e-mail submission. +gitlink:git-gc[1]:: + Cleanup unnecessary files and optimize the local repository. + gitlink:git-grep[1]:: Print lines matching a pattern. +gitlink:git-init[1]:: + Create an empty git repository or reinitialize an existing one. + gitlink:gitk[1]:: The git repository browser. gitlink:git-log[1]:: Show commit logs. -gitlink:git-ls-remote[1]:: - List references in a remote repository. - gitlink:git-merge[1]:: Join two or more development histories together. gitlink:git-mv[1]:: Move or rename a file, a directory, or a symlink. -gitlink:git-pack-refs[1]:: - Pack heads and tags for efficient repository access. - gitlink:git-pull[1]:: Fetch from and merge with another repository or a local branch. @@ -70,12 +70,6 @@ gitlink:git-push[1]:: gitlink:git-rebase[1]:: Forward-port local commits to the updated upstream head. -gitlink:git-repack[1]:: - Pack unpacked objects in a repository. - -gitlink:git-rerere[1]:: - Reuse recorded resolution of conflicted merges. - gitlink:git-reset[1]:: Reset current HEAD to the specified state. @@ -94,15 +88,9 @@ gitlink:git-shortlog[1]:: gitlink:git-show[1]:: Show various types of objects. -gitlink:git-show-branch[1]:: - Show branches and their commits. - gitlink:git-status[1]:: Show the working tree status. -gitlink:git-verify-tag[1]:: - Check the GPG signature of tag. - -gitlink:git-whatchanged[1]:: - Show logs with difference each commit introduces. +gitlink:git-tag[1]:: + Create or verify a tag object signed with GPG. diff --git a/cmds-plumbinginterrogators.txt b/cmds-plumbinginterrogators.txt index 28580eae9..ad2256358 100644 --- a/cmds-plumbinginterrogators.txt +++ b/cmds-plumbinginterrogators.txt @@ -1,9 +1,6 @@ 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-files[1]:: Compares files in the working tree and the index. @@ -19,12 +16,12 @@ gitlink:git-diff-tree[1]:: 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]:: Show information about files in the index and the working tree. +gitlink:git-ls-remote[1]:: + List references in a remote repository. + gitlink:git-ls-tree[1]:: List the contents of a tree object. diff --git a/cmds-plumbingmanipulators.txt b/cmds-plumbingmanipulators.txt index 436387710..a7eba19c4 100644 --- a/cmds-plumbingmanipulators.txt +++ b/cmds-plumbingmanipulators.txt @@ -13,9 +13,6 @@ gitlink:git-hash-object[1]:: gitlink:git-index-pack[1]:: Build pack index file for an existing packed archive. -gitlink:git-init[1]:: - Create an empty git repository or reinitialize an existing one. - gitlink:git-merge-file[1]:: Run a three-way file merge. @@ -37,8 +34,8 @@ gitlink:git-prune-packed[1]:: gitlink:git-read-tree[1]:: Reads tree information into the index. -gitlink:git-repo-config[1]:: - Get and set repository or global options. +gitlink:git-symbolic-ref[1]:: + Read and modify symbolic refs. gitlink:git-unpack-objects[1]:: Unpack objects from a packed archive. @@ -46,6 +43,9 @@ gitlink:git-unpack-objects[1]:: gitlink:git-update-index[1]:: Register file contents in the working tree to the index. +gitlink:git-update-ref[1]:: + Update the object name stored in a ref safely. + gitlink:git-write-tree[1]:: Create a tree object from the current index. diff --git a/cmds-purehelpers.txt b/cmds-purehelpers.txt new file mode 100644 index 000000000..d0cc56904 --- /dev/null +++ b/cmds-purehelpers.txt @@ -0,0 +1,30 @@ +gitlink:git-applypatch[1]:: + Apply one patch extracted from an e-mail. + +gitlink:git-check-ref-format[1]:: + Make sure ref name is well formed. + +gitlink:git-fmt-merge-msg[1]:: + Produce a merge commit message. + +gitlink:git-mailinfo[1]:: + Extracts patch and authorship from a single e-mail message. + +gitlink:git-mailsplit[1]:: + Simple UNIX mbox splitter program. + +gitlink:git-merge-one-file[1]:: + The standard helper program to use with git-merge-index. + +gitlink:git-patch-id[1]:: + Compute unique ID for a patch. + +gitlink:git-peek-remote[1]:: + List the references in a remote repository. + +gitlink:git-sh-setup[1]:: + Common git shell script setup code. + +gitlink:git-stripspace[1]:: + Filter out empty lines. + diff --git a/cmds-synchelpers.txt b/cmds-synchelpers.txt new file mode 100644 index 000000000..e04554ace --- /dev/null +++ b/cmds-synchelpers.txt @@ -0,0 +1,21 @@ +gitlink:git-http-fetch[1]:: + Download from a remote git repository via HTTP. + +gitlink:git-http-push[1]:: + Push objects over HTTP/DAV to another repository. + +gitlink:git-parse-remote[1]:: + Routines to help parsing remote repository access parameters. + +gitlink:git-receive-pack[1]:: + Receive what is pushed into the repository. + +gitlink:git-shell[1]:: + Restricted login shell for GIT-only SSH access. + +gitlink:git-upload-archive[1]:: + Send archive back to git-archive. + +gitlink:git-upload-pack[1]:: + Send objects packed back to git-fetch-pack. + diff --git a/cmds-synchingrepositories.txt b/cmds-synchingrepositories.txt index 01b5bb992..736818f0c 100644 --- a/cmds-synchingrepositories.txt +++ b/cmds-synchingrepositories.txt @@ -1,27 +1,15 @@ +gitlink:git-daemon[1]:: + A really simple server for git repositories. + gitlink:git-fetch-pack[1]:: Receive missing objects from another repository. -gitlink:git-http-fetch[1]:: - Download from a remote git repository via HTTP. - -gitlink:git-http-push[1]:: - Push objects over HTTP/DAV to another repository. - gitlink:git-local-fetch[1]:: Duplicate another git repository on a local system. -gitlink:git-peek-remote[1]:: - List the references in a remote repository. - -gitlink:git-receive-pack[1]:: - Receive what is pushed into the repository. - gitlink:git-send-pack[1]:: Push objects over git protocol to another reposiotory. -gitlink:git-shell[1]:: - Restricted login shell for GIT-only SSH access. - gitlink:git-ssh-fetch[1]:: Fetch from a remote repository over ssh connection. @@ -31,9 +19,3 @@ gitlink:git-ssh-upload[1]:: gitlink:git-update-server-info[1]:: Update auxiliary info file to help dumb servers. -gitlink:git-upload-archive[1]:: - Send archive back to git-archive. - -gitlink:git-upload-pack[1]:: - Send objects packed back to git-fetch-pack. - diff --git a/config.txt b/config.txt index da7fde56b..f1f409d24 100644 --- a/config.txt +++ b/config.txt @@ -356,6 +356,10 @@ remote..push:: The default set of "refspec" for gitlink:git-push[1]. See gitlink:git-push[1]. +remote..receivepack:: + The default program to execute on the remote side when pulling. See + option \--exec of gitlink:git-push[1]. + repack.usedeltabaseoffset:: Allow gitlink:git-repack[1] to create packs that uses delta-base offset. Defaults to false. diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 12c00f3b8..e77750f4b 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -272,7 +272,7 @@ git-fetch-pack(1) Manual Page

SYNOPSIS

-

git-fetch-pack [-q] [-k] [--exec=<git-upload-pack>] [<host>:]<directory> [<refs>…]

+

git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--exec=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>…]

DESCRIPTION

@@ -291,7 +291,15 @@ have a common ancestor commit.

--q +--all +
+
+

+ Fetch all remote refs. +

+
+
+--quiet, \-q

@@ -300,7 +308,7 @@ have a common ancestor commit.

--k +--keep, \-k

@@ -311,6 +319,15 @@ have a common ancestor commit.

+--thin +
+
+

+ Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. +

+
+
--exec=<git-upload-pack>
@@ -328,6 +345,22 @@ have a common ancestor commit.

+--depth=<n> +
+
+

+ Limit fetching to ancestor-chains not longer than n. +

+
+
+\-v +
+
+

+ Run verbosely. +

+
+
<host>
@@ -371,7 +404,7 @@ have a common ancestor commit.

diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 90ef127d1..bd8ebacd7 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt @@ -8,7 +8,7 @@ git-fetch-pack - Receive missing objects from another repository SYNOPSIS -------- -'git-fetch-pack' [-q] [-k] [--exec=] [:] [...] +'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--exec=] [--depth=] [-v] [:] [...] DESCRIPTION ----------- @@ -28,17 +28,24 @@ have a common ancestor commit. OPTIONS ------- --q:: +\--all:: + Fetch all remote refs. + +\--quiet, \-q:: Pass '-q' flag to 'git-unpack-objects'; this makes the cloning process less verbose. --k:: +\--keep, \-k:: Do not invoke 'git-unpack-objects' on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking. ---exec=:: +\--thin:: + Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. + +\--exec=:: Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment @@ -50,6 +57,12 @@ OPTIONS shells by having a lean .bashrc file (they set most of the things up in .bash_profile). +\--depth=:: + Limit fetching to ancestor-chains not longer than n. + +\-v:: + Run verbosely. + :: A remote host that houses the repository. When this part is specified, 'git-upload-pack' is invoked via diff --git a/git-push.html b/git-push.html index bba84c054..0c3f920b6 100644 --- a/git-push.html +++ b/git-push.html @@ -272,7 +272,7 @@ git-push(1) Manual Page

SYNOPSIS

-

git-push [--all] [--tags] [--exec=<receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>…]

+

git-push [--all] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>…]

DESCRIPTION

@@ -344,7 +344,7 @@ the remote repository.

---exec +--receive-pack=<git-receive-pack>

@@ -355,6 +355,14 @@ the remote repository.

+--exec=<git-receive-pack> +
+
+

+ Same as --receive-pack=<git-receive-pack>. +

+
+
-f, --force
@@ -544,7 +552,7 @@ by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-push.txt b/git-push.txt index 3e8dbcf93..f8cc2b543 100644 --- a/git-push.txt +++ b/git-push.txt @@ -8,7 +8,7 @@ git-push - Update remote refs along with associated objects SYNOPSIS -------- -'git-push' [--all] [--tags] [--exec=] [--repo=all] [-f | --force] [-v] [ ...] +'git-push' [--all] [--tags] [--receive-pack=] [--repo=all] [-f | --force] [-v] [ ...] DESCRIPTION ----------- @@ -67,12 +67,15 @@ the remote repository. addition to refspecs explicitly listed on the command line. -\--exec:: +\--receive-pack=:: Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. +\--exec=:: + Same as \--receive-pack=. + -f, \--force:: Usually, the command refuses to update a remote ref that is not a descendant of the local ref used to overwrite it. diff --git a/git-repo-config.html b/git-repo-config.html index 0a979cf8d..58f8f4baf 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -1163,6 +1163,15 @@ remote.<name>.push

+remote.<name>.receivepack +
+
+

+ The default program to execute on the remote side when pulling. See + option --exec of git-push(1). +

+
+
repack.usedeltabaseoffset
@@ -1284,7 +1293,7 @@ receive.denyNonFastForwards diff --git a/git-send-pack.html b/git-send-pack.html index 3ef3baf20..b308f3525 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -272,7 +272,7 @@ git-send-pack(1) Manual Page

SYNOPSIS

-

git-send-pack [--all] [--force] [--exec=<git-receive-pack>] [<host>:]<directory> [<ref>…]

+

git-send-pack [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>…]

DESCRIPTION

@@ -285,7 +285,7 @@ updates it from the current repository, sending named refs.

---exec=<git-receive-pack> +--receive-pack=<git-receive-pack>

@@ -296,6 +296,14 @@ updates it from the current repository, sending named refs.

+--exec=<git-receive-pack> +
+
+

+ Same as --receive-pack=<git-receive-pack>. +

+
+
--all
@@ -317,6 +325,23 @@ updates it from the current repository, sending named refs.

+--verbose +
+
+

+ Run verbosely. +

+
+
+--thin +
+
+

+ Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. +

+
+
<host>
@@ -418,7 +443,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-send-pack.txt b/git-send-pack.txt index eea8fe8af..2f6267ce6 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -8,7 +8,7 @@ git-send-pack - Push objects over git protocol to another reposiotory SYNOPSIS -------- -'git-send-pack' [--all] [--force] [--exec=] [:] [...] +'git-send-pack' [--all] [--force] [--receive-pack=] [--verbose] [--thin] [:] [...] DESCRIPTION ----------- @@ -21,23 +21,33 @@ updates it from the current repository, sending named refs. OPTIONS ------- ---exec=:: +\--receive-pack=:: Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. ---all:: +\--exec=:: + Same as \--receive-pack=. + +\--all:: Instead of explicitly specifying which refs to update, update all refs that locally exist. ---force:: +\--force:: Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care. +\--verbose:: + Run verbosely. + +\--thin:: + Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. + :: A remote host to house the repository. When this part is specified, 'git-receive-pack' is invoked via diff --git a/git.html b/git.html index c9e29c37e..d866c98bf 100644 --- a/git.html +++ b/git.html @@ -386,14 +386,6 @@ ancillary user utilities.

-git-applymbox(1) -
-
-

- Apply a series of patches in a mailbox. -

-
-
git-archive(1)
@@ -458,6 +450,14 @@ ancillary user utilities.

+git-describe(1) +
+
+

+ Show the most recent tag that is reachable from a commit. +

+
+
git-diff(1)
@@ -482,59 +482,59 @@ ancillary user utilities.

-git-grep(1) +git-gc(1)

- Print lines matching a pattern. + Cleanup unnecessary files and optimize the local repository.

-gitk(1) +git-grep(1)

- The git repository browser. + Print lines matching a pattern.

-git-log(1) +git-init(1)

- Show commit logs. + Create an empty git repository or reinitialize an existing one.

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

- List references in a remote repository. + The git repository browser.

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

- Join two or more development histories together. + Show commit logs.

-git-mv(1) +git-merge(1)

- Move or rename a file, a directory, or a symlink. + Join two or more development histories together.

-git-pack-refs(1) +git-mv(1)

- Pack heads and tags for efficient repository access. + Move or rename a file, a directory, or a symlink.

@@ -562,22 +562,6 @@ ancillary user utilities.

-git-repack(1) -
-
-

- Pack unpacked objects in a repository. -

-
-
-git-rerere(1) -
-
-

- Reuse recorded resolution of conflicted merges. -

-
-
git-reset(1)
@@ -626,14 +610,6 @@ ancillary user utilities.

-git-show-branch(1) -
-
-

- Show branches and their commits. -

-
-
git-status(1)
@@ -642,19 +618,11 @@ ancillary user utilities.

-git-verify-tag(1) -
-
-

- Check the GPG signature of tag. -

-
-
-git-whatchanged(1) +git-tag(1)

- Show logs with difference each commit introduces. + Create or verify a tag object signed with GPG.

@@ -662,22 +630,6 @@ ancillary user utilities.

Manipulators:

-git-applypatch(1) -
-
-

- Apply one patch extracted from an e-mail. -

-
-
-git-archimport(1) -
-
-

- Import an Arch repository into git. -

-
-
git-convert-objects(1)
@@ -686,38 +638,6 @@ ancillary user utilities.

-git-cvsexportcommit(1) -
-
-

- Export a single commit to a CVS checkout. -

-
-
-git-cvsimport(1) -
-
-

- Salvage your data out of another SCM people love to hate. -

-
-
-git-cvsserver(1) -
-
-

- A CVS server emulator for git. -

-
-
-git-gc(1) -
-
-

- Cleanup unnecessary files and optimize the local repository. -

-
-
git-lost-found(1)
@@ -726,11 +646,11 @@ ancillary user utilities.

-git-merge-one-file(1) +git-pack-refs(1)

- The standard helper program to use with git-merge-index. + Pack heads and tags for efficient repository access.

@@ -742,14 +662,6 @@ ancillary user utilities.

-git-quiltimport(1) -
-
-

- Applies a quilt patchset onto the current branch. -

-
-
git-reflog(1)
@@ -766,198 +678,203 @@ ancillary user utilities.

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

- Common git shell script setup code. + Pack unpacked objects in a repository.

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

- Bidirectional operation between a single Subversion branch and git. + Get and set repository or global options.

+
+

Interrogators:

+
-git-svnimport(1) +git-annotate(1)

- Import a SVN repository into git. + Annotate file lines with commit info.

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

- Read and modify symbolic refs. + Apply a series of patches in a mailbox.

-git-tag(1) +git-blame(1)

- Create or verify a tag object signed with GPG. + Show what revision and author last modified each line of a file.

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

- Update the object name stored in a ref safely. + Find commits not merged upstream.

-
-

Interrogators:

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

- Annotate file lines with commit info. + Count unpacked number of objects and their disk consumption.

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

- Show what revision and author last modified each line of a file. + Verifies the connectivity and validity of the objects in the database.

-git-check-ref-format(1) +git-get-tar-commit-id(1)

- Make sure ref name is well formed. + Extract commit ID from an archive created using git-tar-tree.

-git-cherry(1) +git-instaweb(1)

- Find commits not merged upstream. + Instantly browse your working repository in gitweb.

-git-count-objects(1) +git-merge-tree(1)

- Count unpacked number of objects and their disk consumption. + Show three-way merge without touching index.

-git-daemon(1) +git-rerere(1)

- A really simple server for git repositories. + Reuse recorded resolution of conflicted merges.

-git-fmt-merge-msg(1) +git-rev-parse(1)

- Produce a merge commit message. + Pick out and massage parameters.

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

- Extract commit ID from an archive created using git-tar-tree. + A helper for git-status and git-commit.

-git-imap-send(1) +git-show-branch(1)

- Dump a mailbox from stdin into an imap folder. + Show branches and their commits.

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

- Instantly browse your working repository in gitweb. + Check the GPG signature of tag.

-git-mailinfo(1) +git-whatchanged(1)

- Extracts patch and authorship from a single e-mail message. + Show logs with difference each commit introduces.

+
+

Interacting with Others

+

These commands are to interact with foreign SCM and with other +people via patch over e-mail.

+
-git-mailsplit(1) +git-archimport(1)

- Simple UNIX mbox splitter program. + Import an Arch repository into git.

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

- Show three-way merge without touching index. + Export a single commit to a CVS checkout.

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

- Routines to help parsing remote repository access parameters. + Salvage your data out of another SCM people love to hate.

-git-patch-id(1) +git-cvsserver(1)

- Compute unique ID for a patch. + A CVS server emulator for git.

-git-request-pull(1) +git-imap-send(1)

- Generates a summary of pending changes. + Dump a mailbox from stdin into an imap folder.

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

- Pick out and massage parameters. + Applies a quilt patchset onto the current branch.

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

- A helper for git-status and git-commit. + Generates a summary of pending changes.

@@ -969,19 +886,19 @@ ancillary user utilities.

-git-stripspace(1) +git-svn(1)

- Filter out empty lines. + Bidirectional operation between a single Subversion branch and git.

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

- Read and modify symbolic refs. + Import a SVN repository into git.

@@ -993,7 +910,14 @@ 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 interface (input, output, set of options and the semantics) +to these low-level commands are meant to be a lot more stable +than Porcelain level commands, because these commands are +primarily for scripted use. The interface to Porcelain commands +on the other hand are subject to change in order to improve the +end user experience.

+

The following description divides +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.

@@ -1040,14 +964,6 @@ repositories.

-git-init(1) -
-
-

- Create an empty git repository or reinitialize an existing one. -

-
-
git-merge-file(1)
@@ -1104,11 +1020,11 @@ repositories.

-git-repo-config(1) +git-symbolic-ref(1)

- Get and set repository or global options. + Read and modify symbolic refs.

@@ -1128,6 +1044,14 @@ repositories.

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

+ Update the object name stored in a ref safely. +

+
+
git-write-tree(1)
@@ -1147,14 +1071,6 @@ repositories.

-git-describe(1) -
-
-

- Show the most recent tag that is reachable from a commit. -

-
-
git-diff-files(1)
@@ -1195,19 +1111,19 @@ repositories.

-git-fsck-objects(1) +git-ls-files(1)

- Verifies the connectivity and validity of the objects in the database. + Show information about files in the index and the working tree.

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

- Show information about files in the index and the working tree. + List references in a remote repository.

@@ -1304,6 +1220,14 @@ the working tree.

Synching repositories

+git-daemon(1) +
+
+

+ A really simple server for git repositories. +

+
+
git-fetch-pack(1)
@@ -1312,83 +1236,87 @@ the working tree.

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

- Download from a remote git repository via HTTP. + Duplicate another git repository on a local system.

-git-http-push(1) +git-send-pack(1)

- Push objects over HTTP/DAV to another repository. + Push objects over git protocol to another reposiotory.

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

- Duplicate another git repository on a local system. + Fetch from a remote repository over ssh connection.

-git-peek-remote(1) +git-ssh-upload(1)

- List the references in a remote repository. + Push to a remote repository over ssh connection.

-git-receive-pack(1) +git-update-server-info(1)

- Receive what is pushed into the repository. + Update auxiliary info file to help dumb servers.

+
+

The following are helper programs used by the above; end users +typically do not use them directly.

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

- Push objects over git protocol to another reposiotory. + Download from a remote git repository via HTTP.

-git-shell(1) +git-http-push(1)

- Restricted login shell for GIT-only SSH access. + Push objects over HTTP/DAV to another repository.

-git-ssh-fetch(1) +git-parse-remote(1)

- Fetch from a remote repository over ssh connection. + Routines to help parsing remote repository access parameters.

-git-ssh-upload(1) +git-receive-pack(1)

- Push to a remote repository over ssh connection. + Receive what is pushed into the repository.

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

- Update auxiliary info file to help dumb servers. + Restricted login shell for GIT-only SSH access.

@@ -1408,6 +1336,91 @@ the working tree.

+

Internal helper commands

+

These are internal helper commands used by other commands; end +users typically do not use them directly.

+
+
+git-applypatch(1) +
+
+

+ Apply one patch extracted from an e-mail. +

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

+ Make sure ref name is well formed. +

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

+ Produce a merge commit message. +

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

+ Extracts patch and authorship from a single e-mail message. +

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

+ Simple UNIX mbox splitter program. +

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

+ The standard helper program to use with git-merge-index. +

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

+ Compute unique ID for a patch. +

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

+ List the references in a remote repository. +

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

+ Common git shell script setup code. +

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

+ Filter out empty lines. +

+
+

Configuration Mechanism

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

diff --git a/git.txt b/git.txt index ac222060e..9761de36b 100644 --- a/git.txt +++ b/git.txt @@ -93,6 +93,16 @@ Interrogators: include::cmds-ancillaryinterrogators.txt[] + +Interacting with Others +~~~~~~~~~~~~~~~~~~~~~~~ + +These commands are to interact with foreign SCM and with other +people via patch over e-mail. + +include::cmds-foreignscminterface.txt[] + + Low-level commands (plumbing) ----------------------------- @@ -102,11 +112,20 @@ 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 interface (input, output, set of options and the semantics) +to these low-level commands are meant to be a lot more stable +than Porcelain level commands, because these commands are +primarily for scripted use. The interface to Porcelain commands +on the other hand are subject to change in order to improve the +end user experience. + +The following description divides +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 ~~~~~~~~~~~~~~~~~~~~~ @@ -127,6 +146,20 @@ Synching repositories include::cmds-synchingrepositories.txt[] +The following are helper programs used by the above; end users +typically do not use them directly. + +include::cmds-synchelpers.txt[] + + +Internal helper commands +~~~~~~~~~~~~~~~~~~~~~~~~ + +These are internal helper commands used by other commands; end +users typically do not use them directly. + +include::cmds-purehelpers.txt[] + Configuration Mechanism -----------------------