X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git.html;h=7811ef0e0afbe0cc6b1a8e9332816979b1a0d512;hb=617fdb88b05107e6673f6aafb280c1ef27acae7b;hp=32f40a4fb8a1834fdd2bf8087a53096bc0de0158;hpb=e663a7acb10392380c82054b20e6011650051425;p=git.git

diff --git a/git.html b/git.html
index 32f40a4f..7811ef0e 100644
--- a/git.html
+++ b/git.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -276,10 +276,13 @@ git(7) Manual Page
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
-<p><em>git</em> is both a program and a directory content tracker system.
-The program <em>git</em> is just a wrapper to reach the core git programs
-(or a potty if you like, as it's not exactly porcelain but still
-brings your stuff to the plumbing).</p>
+<p>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.</p>
+<p>See this <a href="tutorial.html">tutorial</a> to get started, then see
+<a href="everyday.html">Everyday Git</a> for a useful minimum set of commands, and
+"man git-commandname" for documentation of each command.  CVS users may
+also want to read <a href="cvs-migration.html">CVS migration</a>.</p>
 </div>
 <h2>OPTIONS</h2>
 <div class="sectionbody">
@@ -289,7 +292,7 @@ brings your stuff to the plumbing).</p>
 </dt>
 <dd>
 <p>
-        prints the git suite version that the <em>git</em> program came from.
+        Prints the git suite version that the <em>git</em> program came from.
 </p>
 </dd>
 <dt>
@@ -297,9 +300,10 @@ brings your stuff to the plumbing).</p>
 </dt>
 <dd>
 <p>
-        prints the synopsis and a list of available commands.
-        If a git command is named this option will bring up the
-        man-page for that command.
+        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 <em>--all</em> or <em>-a</em> is
+        given then all available commands are printed.
 </p>
 </dd>
 <dt>
@@ -307,7 +311,7 @@ brings your stuff to the plumbing).</p>
 </dt>
 <dd>
 <p>
-        path to wherever your core git programs are installed.
+        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 <em>git</em> will print
         the current setting and then exit.
@@ -315,45 +319,32 @@ brings your stuff to the plumbing).</p>
 </dd>
 </dl>
 </div>
-<h2>NOT LEARNING CORE GIT COMMANDS</h2>
+<h2>FURTHER DOCUMENTATION</h2>
 <div class="sectionbody">
-<p>This manual is intended to give complete background information
-and internal workings of git, which may be too much for most
-people.  The <a href="#Discussion">[Discussion]</a> section below contains much useful
-definition and clarification - read that first.</p>
-<p>If you are interested in using git to manage (version control)
-projects, use <a href="tutorial.html">The Tutorial</a> to get you started,
-and then <a href="everyday.html">Everyday GIT</a> as a guide to the
-minimum set of commands you need to know for day-to-day work.
-Most likely, that will get you started, and you can go a long
-way without knowing the low level details too much.</p>
-<p>The <a href="core-tutorial.html">Core tutorial</a> document covers how things
-internally work.</p>
-<p>If you are migrating from CVS, <a href="cvs-migration.html">cvs
-migration</a> document may be helpful after you finish the
-tutorial.</p>
-<p>After you get the general feel from the tutorial and this
-overview page, you may want to take a look at the
-<a href="howto-index.html">howto</a> documents.</p>
+<p>See the references above to get started using git.  The following is
+probably more detail than necessary for a first-time user.</p>
+<p>The <a href="#Discussion">Discussion</a> section below and the
+<a href="core-tutorial.html">Core tutorial</a> both provide introductions to the
+underlying git architecture.</p>
+<p>See also the <a href="howto-index.html">howto</a> documents for some useful
+examples.</p>
 </div>
-<h2>CORE GIT COMMANDS</h2>
+<h2>GIT COMMANDS</h2>
 <div class="sectionbody">
-<p>If you are writing your own Porcelain, you need to be familiar
-with most of the low level commands --- I suggest starting from
-<a href="git-update-index.html">git-update-index(1)</a> and <a href="git-read-tree.html">git-read-tree(1)</a>.</p>
+<p>We divide git into high level ("porcelain") commands and low level
+("plumbing") commands.</p>
 </div>
-<h2>Commands Overview</h2>
+<h2>Low-level commands (plumbing)</h2>
 <div class="sectionbody">
-<p>The git commands can helpfully be split into those that manipulate
-the repository, the index and the files in the working tree, those that
-interrogate and compare them, and those that moves objects and
-references between repositories.</p>
-<p>In addition, git itself comes with a spartan set of porcelain
-commands.  They are usable but are not meant to compete with real
-Porcelains.</p>
-<p>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.</p>
+<p>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 <a href="git-update-index.html">git-update-index(1)</a> and
+<a href="git-read-tree.html">git-read-tree(1)</a>.</p>
+<p>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.</p>
 <h3>Manipulation commands</h3>
 <dl>
 <dt>
@@ -423,6 +414,14 @@ SCMs layered over git.</p>
 </p>
 </dd>
 <dt>
+<a href="git-mktree.html">git-mktree(1)</a>
+</dt>
+<dd>
+<p>
+        Build a tree-object from ls-tree formatted text.
+</p>
+</dd>
+<dt>
 <a href="git-pack-objects.html">git-pack-objects(1)</a>
 </dt>
 <dd>
@@ -745,8 +744,11 @@ the working tree.</p>
 </dd>
 </dl>
 </div>
-<h2>Porcelain-ish Commands</h2>
+<h2>High-level commands (porcelain)</h2>
 <div class="sectionbody">
+<p>We separate the porcelain commands into the main commands and some
+ancillary user utilities.</p>
+<h3>Main porcelain commands</h3>
 <dl>
 <dt>
 <a href="git-add.html">git-add(1)</a>
@@ -805,6 +807,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-clean.html">git-clean(1)</a>
+</dt>
+<dd>
+<p>
+        Remove untracked files from the working tree.
+</p>
+</dd>
+<dt>
 <a href="git-clone.html">git-clone(1)</a>
 </dt>
 <dd>
@@ -917,6 +927,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-rerere.html">git-rerere(1)</a>
+</dt>
+<dd>
+<p>
+        Reuse recorded resolution of conflicted merges.
+</p>
+</dd>
+<dt>
 <a href="git-reset.html">git-reset(1)</a>
 </dt>
 <dd>
@@ -941,6 +959,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-rm.html">git-rm(1)</a>
+</dt>
+<dd>
+<p>
+        Remove files from the working tree and from the index.
+</p>
+</dd>
+<dt>
 <a href="git-shortlog.html">git-shortlog(1)</a>
 </dt>
 <dd>
@@ -949,6 +975,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-show.html">git-show(1)</a>
+</dt>
+<dd>
+<p>
+        Show one commit log and its diff.
+</p>
+</dd>
+<dt>
 <a href="git-show-branch.html">git-show-branch(1)</a>
 </dt>
 <dd>
@@ -981,9 +1015,7 @@ the working tree.</p>
 </p>
 </dd>
 </dl>
-</div>
-<h2>Ancillary Commands</h2>
-<div class="sectionbody">
+<h3>Ancillary Commands</h3>
 <p>Manipulators:</p>
 <dl>
 <dt>
@@ -1027,6 +1059,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-cvsserver.html">git-cvsserver(1)</a>
+</dt>
+<dd>
+<p>
+        A CVS server emulator for git.
+</p>
+</dd>
+<dt>
 <a href="git-lost-found.html">git-lost-found(1)</a>
 </dt>
 <dd>
@@ -1102,6 +1142,22 @@ the working tree.</p>
 <p>Interrogators:</p>
 <dl>
 <dt>
+<a href="git-annotate.html">git-annotate(1)</a>
+</dt>
+<dd>
+<p>
+        Annotate file lines with commit info.
+</p>
+</dd>
+<dt>
+<a href="git-blame.html">git-blame(1)</a>
+</dt>
+<dd>
+<p>
+        Blame file lines on commits.
+</p>
+</dd>
+<dt>
 <a href="git-check-ref-format.html">git-check-ref-format(1)</a>
 </dt>
 <dd>
@@ -1134,6 +1190,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>
+</dt>
+<dd>
+<p>
+        Produce a merge commit message.
+</p>
+</dd>
+<dt>
 <a href="git-get-tar-commit-id.html">git-get-tar-commit-id(1)</a>
 </dt>
 <dd>
@@ -1142,6 +1206,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-imap-send.html">git-imap-send(1)</a>
+</dt>
+<dd>
+<p>
+        Dump a mailbox from stdin into an imap folder.
+</p>
+</dd>
+<dt>
 <a href="git-mailinfo.html">git-mailinfo(1)</a>
 </dt>
 <dd>
@@ -1161,6 +1233,14 @@ the working tree.</p>
 </p>
 </dd>
 <dt>
+<a href="git-merge-tree.html">git-merge-tree(1)</a>
+</dt>
+<dd>
+<p>
+        Show three-way merge without touching index.
+</p>
+</dd>
+<dt>
 <a href="git-patch-id.html">git-patch-id(1)</a>
 </dt>
 <dd>
@@ -1355,20 +1435,12 @@ HEAD
         (i.e. the contents of <tt>$GIT_DIR/refs/heads/&lt;head&gt;</tt>).
 </p>
 </dd>
-<dt>
-&lt;snap&gt;
-</dt>
-<dd>
-<p>
-        a valid snapshot <em>name</em>
-        (i.e. the contents of <tt>$GIT_DIR/refs/snap/&lt;snap&gt;</tt>).
-</p>
-</dd>
 </dl>
 </div>
 <h2>File/Directory Structure</h2>
 <div class="sectionbody">
 <p>Please see <a href="repository-layout.html">repository layout</a> document.</p>
+<p>Read <a href="hooks.html">hooks</a> for more details about each hook.</p>
 <p>Higher level SCMs may provide and manage additional information in the
 <tt>$GIT_DIR</tt>.</p>
 </div>
@@ -2023,7 +2095,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 25-Jan-2006 04:37:14 PDT
+Last updated 18-Apr-2006 21:30:44 UTC
 </div>
 </div>
 </body>
