Documentation updates.

[thirdparty/git.git] / Documentation / git.txt

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 796c4f61ea232aef526ab1032879cf3431d6324d..59d0dc87606548ee02d60936b9cb872b1add3f8b 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -133,6 +133,9 @@ gitlink:git-ls-tree[1]::
 gitlink:git-merge-base[1]::
        Finds as good a common ancestor as possible for a merge
 
+gitlink:git-name-rev[1]::
+       Find symbolic names for given revs
+
 gitlink:git-rev-list[1]::
        Lists commit objects in reverse chronological order
 
@@ -182,6 +185,9 @@ gitlink:git-receive-pack[1]::
 gitlink:git-send-pack[1]::
        Pushes to a remote repository, intelligently.
 
+gitlink:git-shell[1]::
+       Restricted shell for GIT-only SSH access.
+
 gitlink:git-ssh-fetch[1]::
        Pulls from a remote repository over ssh connection
        Previously this command was known as git-ssh-pull.
@@ -206,6 +212,9 @@ gitlink:git-add[1]::
        Add paths to the index file.
        Previously this command was known as git-add-script.
 
+gitlink:git-am[1]::
+       Apply patches from a mailbox, but cooler.
+
 gitlink:git-applymbox[1]::
        Apply patches from a mailbox.
 
@@ -259,6 +268,9 @@ gitlink:git-ls-remote[1]::
 gitlink:git-merge[1]::
        Grand unified merge driver.
 
+gitlink:git-mv[1]::
+       Move or rename a file, a directory, or a symlink.
+
 gitlink:git-octopus[1]::
        Merge more than two commits.
        Previously this command was known as git-octopus-script.
@@ -344,17 +356,29 @@ gitlink:git-relink[1]::
        Hardlink common objects in local repositories.
        Previously this command was known as git-relink-script.
 
+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.
 
+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
        Previously this command was known as git-tag-script.
 
+gitlink:git-update-ref[1]::
+       Update the object name stored in a ref safely.
+
 
 Interrogators:
 
+gitlink:git-check-ref-format[1]::
+       Make sure ref name is well formed.
+
 gitlink:git-cherry[1]::
        Find commits not merged upstream.
 
@@ -392,6 +416,9 @@ 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.
 
+gitlink:git-symbolic-refs[1]::
+       Read and modify symbolic refs.
+
 gitlink:git-stripspace[1]::
        Filter out empty lines.
 
@@ -403,6 +430,37 @@ gitlink:gitk[1]::
        gitk.
 
 
+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 modelled after `.ini` format familiar to some
+people.  Here is an example:
+
+------------
+#
+# This is the config file, and
+# 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>::