Added support for dropping privileges to git-daemon.
[gitweb.git] / Documentation / git.txt
index bec562e30e9aad32863d3ea85a283a993453715c..3de5fa9c82de4d49a041480ce6681f69a97f167c 100644 (file)
@@ -1,6 +1,5 @@
 git(7)
 ======
-v0.99.6, Sep 2005
 
 NAME
 ----
@@ -9,434 +8,543 @@ git - the stupid content tracker
 
 SYNOPSIS
 --------
-'git-<command>' <args>
+'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate]
+       [--bare] [--git-dir=GIT_DIR] [--help] COMMAND [ARGS]
 
 DESCRIPTION
 -----------
+Git is a fast, scalable, distributed revision control system with an
+unusually rich command set that provides both high-level operations
+and full access to internals.
+
+See this link:tutorial.html[tutorial] to get started, then see
+link:everyday.html[Everyday Git] for a useful minimum set of commands, and
+"man git-commandname" for documentation of each command.  CVS users may
+also want to read link:cvs-migration.html[CVS migration].
+
+The COMMAND is either a name of a Git command (see below) or an alias
+as defined in the configuration file (see gitlink:git-repo-config[1]).
+
+OPTIONS
+-------
+--version::
+       Prints the git suite version that the 'git' program came from.
+
+--help::
+       Prints the synopsis and a list of the most commonly used
+       commands.  If a git command is named this option will bring up
+       the man-page for that command. If the option '--all' or '-a' is
+       given then all available commands are printed.
+
+--exec-path::
+       Path to wherever your core git programs are installed.
+       This can also be controlled by setting the GIT_EXEC_PATH
+       environment variable. If no path is given 'git' will print
+       the current setting and then exit.
+
+-p|--paginate::
+       Pipe all output into 'less' (or if set, $PAGER).
+
+--git-dir=<path>::
+       Set the path to the repository. This can also be controlled by
+       setting the GIT_DIR environment variable.
+
+--bare::
+       Same as --git-dir=`pwd`.
+
+FURTHER DOCUMENTATION
+---------------------
 
-This is reference information for the core git commands.
-
-Before reading this cover to cover, you may want to take a look
-at the link:tutorial.html[tutorial] document.
-
-The <<Discussion>> section below contains much useful definition and
-clarification info - read that first.  And of the commands, I suggest
-reading link:git-update-index.html[git-update-index] and
-link:git-read-tree.html[git-read-tree] first - I wish I had!
-
-If you are migrating from CVS, link:cvs-migration.html[cvs migration]
-document may be helpful after you finish the tutorial.
+See the references above to get started using git.  The following is
+probably more detail than necessary for a first-time user.
 
-After you get the general feel from the tutorial and this
-overview page, you may want to take a look at the
-link:howto-index.html[howto] documents.
+The <<Discussion,Discussion>> section below and the
+link:core-tutorial.html[Core tutorial] both provide introductions to the
+underlying git architecture.
 
+See also the link:howto-index.html[howto] documents for some useful
+examples.
 
-David Greaves <david@dgreaves.com>
-08/05/05
+GIT COMMANDS
+------------
 
-Updated by Junio C Hamano <junkio@cox.net> on 2005-05-05 to
-reflect recent changes.
+We divide git into high level ("porcelain") commands and low level
+("plumbing") commands.
 
-Commands Overview
------------------
-The git commands can helpfully be split into those that manipulate
-the repository, the cache and the working fileset, those that
-interrogate and compare them, and those that moves objects and
-references between repositories.
+Low-level commands (plumbing)
+-----------------------------
 
-In addition, git itself comes with a spartan set of porcelain
-commands.  They are usable but are not meant to compete with real
-Porcelains.
+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].
 
-There are also some ancillary programs that can be viewed as useful
-aids for using the core commands but which are unlikely to be used by
-SCMs layered over git.
+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
 ~~~~~~~~~~~~~~~~~~~~~
-link:git-apply.html[git-apply]::
+gitlink:git-apply[1]::
        Reads a "diff -up1" or git generated patch file and
        applies it to the working tree.
 
-link:git-checkout-index.html[git-checkout-index]::
-       Copy files from the cache to the working directory
-       Previously this command was known as git-checkout-cache.
+gitlink:git-checkout-index[1]::
+       Copy files from the index to the working tree.
 
-link:git-commit-tree.html[git-commit-tree]::
-       Creates a new commit object
+gitlink:git-commit-tree[1]::
+       Creates a new commit object.
 
-link:git-hash-object.html[git-hash-object]::
+gitlink:git-hash-object[1]::
        Computes the object ID from a file.
 
-link:git-init-db.html[git-init-db]::
-       Creates an empty git object database
+gitlink:git-index-pack[1]::
+       Build pack idx file for an existing packed archive.
 
-link:git-merge-index.html[git-merge-index]::
-       Runs a merge for files needing merging
-       Previously this command was known as git-merge-cache.
+gitlink:git-init-db[1]::
+       Creates an empty git object database, or reinitialize an
+       existing one.
 
-link:git-mktag.html[git-mktag]::
-       Creates a tag object
+gitlink:git-merge-index[1]::
+       Runs a merge for files needing merging.
 
-link:git-pack-objects.html[git-pack-objects]::
+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.
 
-link:git-prune-packed.html[git-prune-packed]::
+gitlink:git-prune-packed[1]::
        Remove extra objects that are already in pack files.
 
-link:git-read-tree.html[git-read-tree]::
-       Reads tree information into the directory cache
+gitlink:git-read-tree[1]::
+       Reads tree information into the index.
+
+gitlink:git-repo-config[1]::
+       Get and set options in .git/config.
 
-link:git-unpack-objects.html[git-unpack-objects]::
+gitlink:git-unpack-objects[1]::
        Unpacks objects out of a packed archive.
 
-link:git-update-index.html[git-update-index]::
-       Modifies the index or directory cache
-       Previously this command was known as git-update-cache.
+gitlink:git-update-index[1]::
+       Registers files in the working tree to the index.
 
-link:git-write-tree.html[git-write-tree]::
-       Creates a tree from the current cache
+gitlink:git-write-tree[1]::
+       Creates a tree from the index.
 
 
 Interrogation commands
 ~~~~~~~~~~~~~~~~~~~~~~
 
-link:git-cat-file.html[git-cat-file]::
-       Provide content or type information for repository objects
+gitlink:git-cat-file[1]::
+       Provide content or type/size information for repository objects.
 
-link:git-diff-index.html[git-diff-index]::
-       Compares content and mode of blobs between the cache and repository
-       Previously this command was known as git-diff-cache.
+gitlink:git-describe[1]::
+       Show the most recent tag that is reachable from a commit.
 
-link:git-diff-files.html[git-diff-files]::
-       Compares files in the working tree and the cache
+gitlink:git-diff-index[1]::
+       Compares content and mode of blobs between the index and repository.
 
-link:git-diff-stages.html[git-diff-stages]::
-       Compares two "merge stages" in the index file.
+gitlink:git-diff-files[1]::
+       Compares files in the working tree and the index.
 
-link:git-diff-tree.html[git-diff-tree]::
-       Compares the content and mode of blobs found via two tree objects
+gitlink:git-diff-stages[1]::
+       Compares two "merge stages" in the index.
 
-link:git-export.html[git-export]::
-       Exports each commit and a diff against each of its parents
+gitlink:git-diff-tree[1]::
+       Compares the content and mode of blobs found via two tree objects.
 
-link:git-fsck-objects.html[git-fsck-objects]::
-       Verifies the connectivity and validity of the objects in the database
-       Previously this command was known as git-fsck-cache.
+gitlink:git-fsck-objects[1]::
+       Verifies the connectivity and validity of the objects in the database.
 
-link:git-ls-files.html[git-ls-files]::
-       Information about files in the cache/working directory
+gitlink:git-ls-files[1]::
+       Information about files in the index and the working tree.
 
-link:git-ls-tree.html[git-ls-tree]::
-       Displays a tree object in human readable form
+gitlink:git-ls-tree[1]::
+       Displays a tree object in human readable form.
 
-link:git-merge-base.html[git-merge-base]::
-       Finds as good a common ancestor as possible for a merge
+gitlink:git-merge-base[1]::
+       Finds as good common ancestors as possible for a merge.
 
-link:git-rev-list.html[git-rev-list]::
-       Lists commit objects in reverse chronological order
+gitlink:git-name-rev[1]::
+       Find symbolic names for given revs.
 
-link:git-rev-tree.html[git-rev-tree]::
-       Provides the revision tree for one or more commits
+gitlink:git-pack-redundant[1]::
+       Find redundant pack files.
 
-link:git-show-index.html[git-show-index]::
+gitlink:git-rev-list[1]::
+       Lists commit objects in reverse chronological order.
+
+gitlink:git-show-index[1]::
        Displays contents of a pack idx file.
 
-link:git-tar-tree.html[git-tar-tree]::
-       Creates a tar archive of the files in the named tree
+gitlink:git-tar-tree[1]::
+       Creates a tar archive of the files in the named tree object.
 
-link:git-unpack-file.html[git-unpack-file]::
-       Creates a temporary file with a blob's contents
+gitlink:git-unpack-file[1]::
+       Creates a temporary file with a blob's contents.
 
-link:git-var.html[git-var]::
-       Displays a git logical variable
+gitlink:git-var[1]::
+       Displays a git logical variable.
 
-link:git-verify-pack.html[git-verify-pack]::
-       Validates packed GIT archive files
+gitlink:git-verify-pack[1]::
+       Validates packed git archive files.
 
-The interrogate commands may create files - and you can force them to
-touch the working file set - but in general they don't
+In general, the interrogate commands do not touch the files in
+the working tree.
 
 
 Synching repositories
 ~~~~~~~~~~~~~~~~~~~~~
 
-link:git-clone-pack.html[git-clone-pack]::
-       Clones a repository into the current repository (engine
-       for ssh and local transport)
-
-link:git-fetch-pack.html[git-fetch-pack]::
-       Updates from a remote repository.
+gitlink:git-fetch-pack[1]::
+       Updates from a remote repository (engine for ssh and
+       local transport).
 
-link:git-http-fetch.html[git-http-fetch]::
-       Downloads a remote GIT repository via HTTP
-       Previously this command was known as git-http-pull.
+gitlink:git-http-fetch[1]::
+       Downloads a remote git repository via HTTP by walking
+       commit chain.
 
-link:git-local-fetch.html[git-local-fetch]::
-       Duplicates another GIT repository on a local system
-       Previously this command was known as git-local-pull.
+gitlink:git-local-fetch[1]::
+       Duplicates another git repository on a local system by
+       walking commit chain.
 
-link:git-peek-remote.html[git-peek-remote]::
-       Lists references on a remote repository using upload-pack protocol.
+gitlink:git-peek-remote[1]::
+       Lists references on a remote repository using
+       upload-pack protocol (engine for ssh and local
+       transport).
 
-link:git-receive-pack.html[git-receive-pack]::
+gitlink:git-receive-pack[1]::
        Invoked by 'git-send-pack' to receive what is pushed to it.
 
-link:git-send-pack.html[git-send-pack]::
+gitlink:git-send-pack[1]::
        Pushes to a remote repository, intelligently.
 
-link:git-ssh-fetch.html[git-ssh-fetch]::
-       Pulls from a remote repository over ssh connection
-       Previously this command was known as git-ssh-pull.
+gitlink:git-http-push[1]::
+       Push missing objects using HTTP/DAV.
+
+gitlink:git-shell[1]::
+       Restricted shell for GIT-only SSH access.
 
-link:git-ssh-upload.html[git-ssh-upload]::
-       Helper "server-side" program used by git-ssh-fetch
-       Previously this command was known as git-ssh-push.
+gitlink:git-ssh-fetch[1]::
+       Pulls from a remote repository over ssh connection by
+       walking commit chain.
 
-link:git-update-server-info.html[git-update-server-info]::
+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.
 
-link:git-upload-pack.html[git-upload-pack]::
-       Invoked by 'git-clone-pack' and 'git-fetch-pack' to push
+gitlink:git-upload-pack[1]::
+       Invoked by 'git-fetch-pack' to push
        what are asked for.
 
+gitlink:git-upload-tar[1]::
+       Invoked by 'git-tar-tree --remote' to return the tar
+       archive the other end asked for.
 
-Porcelain-ish Commands
-----------------------
 
-link:git-add.html[git-add]::
-       Add paths to the index file.
-       Previously this command was known as git-add-script.
+High-level commands (porcelain)
+-------------------------------
+
+We separate the porcelain commands into the main commands and some
+ancillary user utilities.
 
-link:git-applymbox.html[git-applymbox]::
-       Apply patches from a mailbox.
+Main porcelain commands
+~~~~~~~~~~~~~~~~~~~~~~~
 
-link:git-bisect.html[git-bisect]::
-       Find the change that introduced a bug.
-       Previously this command was known as git-bisect-script.
+gitlink:git-add[1]::
+       Add paths to the index.
 
-link:git-branch.html[git-branch]::
+gitlink:git-am[1]::
+       Apply patches from a mailbox, but cooler.
+
+gitlink:git-applymbox[1]::
+       Apply patches from a mailbox, original version by Linus.
+
+gitlink:git-bisect[1]::
+       Find the change that introduced a bug by binary search.
+
+gitlink:git-branch[1]::
        Create and Show branches.
-       Previously this command was known as git-branch-script.
 
-link:git-checkout.html[git-checkout]::
+gitlink:git-checkout[1]::
        Checkout and switch to a branch.
-       Previously this command was known as git-checkout-script.
 
-link:git-cherry-pick.html[git-cherry-pick]::
+gitlink:git-cherry-pick[1]::
        Cherry-pick the effect of an existing commit.
-       Previously this command was known as git-cherry-pick-script.
 
-link:git-clone.html[git-clone]::
+gitlink:git-clean[1]::
+       Remove untracked files from the working tree.
+
+gitlink:git-clone[1]::
        Clones a repository into a new directory.
-       Previously this command was known as git-clone-script.
 
-link:git-commit.html[git-commit]::
+gitlink:git-commit[1]::
        Record changes to the repository.
-       Previously this command was known as git-commit-script.
 
-link:git-diff.html[git-diff]::
+gitlink:git-diff[1]::
        Show changes between commits, commit and working tree, etc.
-       Previously this command was known as git-diff-script.
 
-link:git-fetch.html[git-fetch]::
+gitlink:git-fetch[1]::
        Download from a remote repository via various protocols.
-       Previously this command was known as git-fetch-script.
 
-link:git-format-patch.html[git-format-patch]::
+gitlink:git-format-patch[1]::
        Prepare patches for e-mail submission.
-       Previously this command was known as git-format-patch-script.
 
-link:git-grep.html[git-grep]::
-       Print lines matching a pattern
+gitlink:git-grep[1]::
+       Print lines matching a pattern.
 
-link:git-log.html[git-log]::
+gitlink:git-log[1]::
        Shows commit logs.
-       Previously this command was known as git-log-script.
 
-link:git-ls-remote.html[git-ls-remote]::
+gitlink:git-ls-remote[1]::
        Shows references in a remote or local repository.
-       Previously this command was known as git-ls-remote-script.
 
-link:git-merge.html[git-merge]::
+gitlink:git-merge[1]::
        Grand unified merge driver.
 
-link:git-octopus.html[git-octopus]::
-       Merge more than two commits.
-       Previously this command was known as git-octopus-script.
+gitlink:git-mv[1]::
+       Move or rename a file, a directory, or a symlink.
 
-link:git-pull.html[git-pull]::
+gitlink:git-pull[1]::
        Fetch from and merge with a remote repository.
-       Previously this command was known as git-pull-script.
 
-link:git-push.html[git-push]::
+gitlink:git-push[1]::
        Update remote refs along with associated objects.
-       Previously this command was known as git-push-script.
-
-link:git-rebase.html[git-rebase]::
-       Rebase local commits to new upstream head.
-       Previously this command was known as git-rebase-script.
 
-link:git-rename.html[git-rename]::
-       Rename files and directories.
-       Previously this command was known as git-rename-script.
+gitlink:git-rebase[1]::
+       Rebase local commits to the updated upstream head.
 
-link:git-repack.html[git-repack]::
+gitlink:git-repack[1]::
        Pack unpacked objects in a repository.
-       Previously this command was known as git-repack-script.
 
-link:git-reset.html[git-reset]::
+gitlink:git-rerere[1]::
+       Reuse recorded resolution of conflicted merges.
+
+gitlink:git-reset[1]::
        Reset current HEAD to the specified state.
-       Previously this command was known as git-reset-script.
 
-link:git-resolve.html[git-resolve]::
+gitlink:git-resolve[1]::
        Merge two commits.
-       Previously this command was known as git-resolve-script.
 
-link:git-revert.html[git-revert]::
+gitlink:git-revert[1]::
        Revert an existing commit.
-       Previously this command was known as git-revert-script.
 
-link:git-shortlog.html[git-shortlog]::
+gitlink:git-rm[1]::
+       Remove files from the working tree and from the index.
+
+gitlink:git-shortlog[1]::
        Summarizes 'git log' output.
 
-link:git-show-branch.html[git-show-branch]::
+gitlink:git-show[1]::
+       Show one commit log and its diff.
+
+gitlink:git-show-branch[1]::
        Show branches and their commits.
 
-link:git-status.html[git-status]::
+gitlink:git-status[1]::
        Shows the working tree status.
-       Previously this command was known as git-status-script.
 
-link:git-verify-tag.html[git-verify-tag]::
+gitlink:git-verify-tag[1]::
        Check the GPG signature of tag.
-       Previously this command was known as git-verify-tag-script.
 
-link:git-whatchanged.html[git-whatchanged]::
+gitlink:git-whatchanged[1]::
        Shows commit logs and differences they introduce.
 
 
 Ancillary Commands
-------------------
+~~~~~~~~~~~~~~~~~~
 Manipulators:
 
-link:git-applypatch.html[git-applypatch]::
+gitlink:git-applypatch[1]::
        Apply one patch extracted from an e-mail.
 
-link:git-archimport.html[git-archimport]::
+gitlink:git-archimport[1]::
        Import an arch repository into git.
-       Previously this command was known as git-archimport-script.
 
-link:git-convert-objects.html[git-convert-objects]::
-       Converts old-style GIT repository
-       Previously this command was known as git-convert-cache.
+gitlink:git-convert-objects[1]::
+       Converts old-style git repository.
 
-link:git-cvsimport.html[git-cvsimport]::
+gitlink:git-cvsimport[1]::
        Salvage your data out of another SCM people love to hate.
-       Previously this command was known as git-cvsimport-script.
 
-link:git-merge-one-file.html[git-merge-one-file]::
-       The standard helper program to use with "git-merge-index"
-       Previously this command was known as git-merge-one-file-script.
+gitlink:git-cvsexportcommit[1]::
+       Export a single commit to a CVS checkout.
+
+gitlink:git-cvsserver[1]::
+       A CVS server emulator for git.
+
+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`.
 
-link:git-prune.html[git-prune]::
-       Prunes all unreachable objects from the object database
-       Previously this command was known as git-prune-script.
+gitlink:git-prune[1]::
+       Prunes all unreachable objects from the object database.
 
-link:git-relink.html[git-relink]::
+gitlink:git-quiltimport[1]::
+       Applies a quilt patchset onto the current branch.
+
+gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
-       Previously this command was known as git-relink-script.
 
-link:git-sh-setup.html[git-sh-setup]::
+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-sh-setup[1]::
        Common git shell script setup code.
-       Previously this command was known as git-sh-setup-script.
 
-link:git-tag.html[git-tag]::
-       An example script to create a tag object signed with GPG
-       Previously this command was known as git-tag-script.
+gitlink:git-symbolic-ref[1]::
+       Read and modify symbolic refs.
+
+gitlink:git-tag[1]::
+       An example script to create a tag object signed with GPG.
+
+gitlink:git-update-ref[1]::
+       Update the object name stored in a ref safely.
 
 
 Interrogators:
 
-link:git-cherry.html[git-cherry]::
+gitlink:git-annotate[1]::
+       Annotate file lines with commit info.
+
+gitlink:git-blame[1]::
+       Blame file lines on commits.
+
+gitlink:git-check-ref-format[1]::
+       Make sure ref name is well formed.
+
+gitlink:git-cherry[1]::
        Find commits not merged upstream.
 
-link:git-count-objects.html[git-count-objects]::
+gitlink:git-count-objects[1]::
        Count unpacked number of objects and their disk consumption.
-       Previously this command was known as git-count-objects-script.
 
-link:git-daemon.html[git-daemon]::
-       A really simple server for GIT repositories.
+gitlink:git-daemon[1]::
+       A really simple server for git repositories.
 
-link:git-diff-helper.html[git-diff-helper]::
-       Generates patch format output for git-diff-*
+gitlink:git-fmt-merge-msg[1]::
+       Produce a merge commit message.
 
-link:git-get-tar-commit-id.html[git-get-tar-commit-id]::
+gitlink:git-get-tar-commit-id[1]::
        Extract commit ID from an archive created using git-tar-tree.
 
-link:git-mailinfo.html[git-mailinfo]::
-       Extracts patch from a single e-mail message.
+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 information from a single
+       e-mail message, optionally transliterating the commit
+       message into utf-8.
 
-link:git-mailsplit.html[git-mailsplit]::
-       git-mailsplit.
+gitlink:git-mailsplit[1]::
+       A stupid program to split UNIX mbox format mailbox into
+       individual pieces of e-mail.
 
-link:git-patch-id.html[git-patch-id]::
+gitlink:git-merge-tree[1]::
+       Show three-way merge without touching index.
+
+gitlink:git-patch-id[1]::
        Compute unique ID for a patch.
 
-link:git-parse-remote.html[git-parse-remote]::
-       Routines to help parsing $GIT_DIR/remotes/
-       Previously this command was known as git-parse-remote-script.
+gitlink:git-parse-remote[1]::
+       Routines to help parsing `$GIT_DIR/remotes/` files.
 
-link:git-request-pull.html[git-request-pull]::
+gitlink:git-request-pull[1]::
        git-request-pull.
-       Previously this command was known as git-request-pull-script.
 
-link:git-rev-parse.html[git-rev-parse]::
+gitlink:git-rev-parse[1]::
        Pick out and massage parameters.
 
-link:git-send-email.html[git-send-email]::
+gitlink:git-send-email[1]::
        Send patch e-mails out of "format-patch --mbox" output.
-       Previously this command was known as git-send-email-script.
 
-link:git-stripspace.html[git-stripspace]::
+gitlink:git-symbolic-ref[1]::
+       Read and modify symbolic refs.
+
+gitlink:git-stripspace[1]::
        Filter out empty lines.
 
 
 Commands not yet documented
 ---------------------------
 
-link:gitk.html[gitk]::
-       gitk.
+gitlink:gitk[1]::
+       The gitk repository browser.
+
+
+Configuration Mechanism
+-----------------------
+
+Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
+is used to hold per-repository configuration options.  It is a
+simple text file modeled after `.ini` format familiar to some
+people.  Here is an example:
+
+------------
+#
+# A '#' or ';' character indicates a comment.
+#
+
+; core variables
+[core]
+       ; Don't trust file modes
+       filemode = false
+
+; user identity
+[user]
+       name = "Junio C Hamano"
+       email = "junkio@twinsun.com"
+
+------------
+
+Various commands read from the configuration file and adjust
+their operation accordingly.
 
 
 Identifier Terminology
 ----------------------
 <object>::
-       Indicates the sha1 identifier for any type of object
+       Indicates the object name for any type of object.
 
 <blob>::
-       Indicates a blob object sha1 identifier
+       Indicates a blob object name.
 
 <tree>::
-       Indicates a tree object sha1 identifier
+       Indicates a tree object name.
 
 <commit>::
-       Indicates a commit object sha1 identifier
+       Indicates a commit object name.
 
 <tree-ish>::
-       Indicates a tree, commit or tag object sha1 identifier.  A
+       Indicates a tree, commit or tag object name.  A
        command that takes a <tree-ish> argument ultimately wants to
        operate on a <tree> object but automatically dereferences
        <commit> and <tag> objects that point at a <tree>.
 
 <type>::
        Indicates that an object type is required.
-       Currently one of: blob/tree/commit/tag
+       Currently one of: `blob`, `tree`, `commit`, or `tag`.
 
 <file>::
-       Indicates a filename - always relative to the root of
-       the tree structure GIT_INDEX_FILE describes.
+       Indicates a filename - almost always relative to the
+       root of the tree structure `GIT_INDEX_FILE` describes.
 
 Symbolic Identifiers
 --------------------
@@ -444,17 +552,16 @@ Any git command accepting any <object> can also use the following
 symbolic notation:
 
 HEAD::
-       indicates the head of the repository (ie the contents of
-       `$GIT_DIR/HEAD`)
+       indicates the head of the current branch (i.e. the
+       contents of `$GIT_DIR/HEAD`).
+
 <tag>::
-       a valid tag 'name'+
-       (ie the contents of `$GIT_DIR/refs/tags/<tag>`)
+       a valid tag 'name'
+       (i.e. the contents of `$GIT_DIR/refs/tags/<tag>`).
+
 <head>::
-       a valid head 'name'+
-       (ie the contents of `$GIT_DIR/refs/heads/<head>`)
-<snap>::
-       a valid snapshot 'name'+
-       (ie the contents of `$GIT_DIR/refs/snap/<snap>`)
+       a valid head 'name'
+       (i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
 
 
 File/Directory Structure
@@ -462,8 +569,10 @@ File/Directory Structure
 
 Please see link:repository-layout.html[repository layout] document.
 
+Read link:hooks.html[hooks] for more details about each hook.
+
 Higher level SCMs may provide and manage additional information in the
-GIT_DIR.
+`$GIT_DIR`.
 
 
 Terminology
@@ -479,12 +588,12 @@ The git Repository
 ~~~~~~~~~~~~~~~~~~
 These environment variables apply to 'all' core git commands. Nb: it
 is worth noting that they may be used/overridden by SCMS sitting above
-git so take care if using Cogito etc
+git so take care if using Cogito etc.
 
 'GIT_INDEX_FILE'::
        This environment allows the specification of an alternate
-       cache/index file. If not specified, the default of
-       `$GIT_DIR/index` is used.
+       index file. If not specified, the default of `$GIT_DIR/index`
+       is used.
 
 'GIT_OBJECT_DIRECTORY'::
        If the object storage directory is specified via this
@@ -500,9 +609,9 @@ git so take care if using Cogito etc
        written to these directories.
 
 'GIT_DIR'::
-       If the 'GIT_DIR' environment variable is set then it specifies
-       a path to use instead of `./.git` for the base of the
-       repository.
+       If the 'GIT_DIR' environment variable is set then it
+       specifies a path to use instead of the default `.git`
+       for the base of the repository.
 
 git Commits
 ~~~~~~~~~~~
@@ -511,30 +620,45 @@ git Commits
 'GIT_AUTHOR_DATE'::
 'GIT_COMMITTER_NAME'::
 'GIT_COMMITTER_EMAIL'::
-       see link:git-commit-tree.html[git-commit-tree]
+       see gitlink:git-commit-tree[1]
 
 git Diffs
 ~~~~~~~~~
 'GIT_DIFF_OPTS'::
 'GIT_EXTERNAL_DIFF'::
        see the "generating patches" section in :
-       link:git-diff-index.html[git-diff-index];
-       link:git-diff-files.html[git-diff-files];
-       link:git-diff-tree.html[git-diff-tree]
+       gitlink:git-diff-index[1];
+       gitlink:git-diff-files[1];
+       gitlink:git-diff-tree[1]
+
+other
+~~~~~
+'GIT_PAGER'::
+       This environment variable overrides `$PAGER`.
+
+'GIT_TRACE'::
+       If this variable is set git will print `trace:` messages on
+       stderr telling about alias expansion, built-in command
+       execution and external command execution.
 
 Discussion[[Discussion]]
 ------------------------
-include::../README[]
+include::README[]
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org> and the git-list <git@vger.kernel.org>.
+Authors
+-------
+* git's founding father is Linus Torvalds <torvalds@osdl.org>.
+* The current git nurse is Junio C Hamano <junkio@cox.net>.
+* The git potty was written by Andres Ericsson <ae@op5.se>.
+* General upbringing is handled by the git-list <git@vger.kernel.org>.
 
 Documentation
 --------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
+The documentation for git suite was started by David Greaves
+<david@dgreaves.com>, and later enhanced greatly by the
+contributors on the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite