Autogenerated HTML docs for v1.5.5.1-114-g8d308

diff --git a/config.txt b/config.txt
index 7a24f6e819ea0e5431748cea64b46369dfd6a114..824e416e9f8157d54d3f37e0e520fff5f9a125c0 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -234,7 +234,13 @@ core.worktree::
        used in combination with repositories found automatically in
        a .git directory (i.e. $GIT_DIR is not set).
        This can be overridden by the GIT_WORK_TREE environment
-       variable and the '--work-tree' command line option.
+       variable and the '--work-tree' command line option. It can be
+       a absolute path or relative path to the directory specified by
+       --git-dir or GIT_DIR.
+       Note: If --git-dir or GIT_DIR are specified but none of
+       --work-tree, GIT_WORK_TREE and core.worktree is specified,
+       the current working directory is regarded as the top directory
+       of your working tree.
 
 core.logAllRefUpdates::
        Enable the reflog. Updates to a ref <ref> is logged to the file

diff --git a/git-config.html b/git-config.html
index 78ca9551dcc4ae62a877af026566d289afcbf3bd..f8cf71a078c8f09ff9f21ca94f63f628c5ff32de 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -973,7 +973,13 @@ core.worktree
         used in combination with repositories found automatically in\r
         a .git directory (i.e. $GIT_DIR is not set).\r
         This can be overridden by the GIT_WORK_TREE environment\r
-        variable and the <em>--work-tree</em> command line option.\r
+        variable and the <em>--work-tree</em> command line option. It can be\r
+        a absolute path or relative path to the directory specified by\r
+        --git-dir or GIT_DIR.\r
+        Note: If --git-dir or GIT_DIR are specified but none of\r
+        --work-tree, GIT_WORK_TREE and core.worktree is specified,\r
+        the current working directory is regarded as the top directory\r
+        of your working tree.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2422,7 +2428,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Apr-2008 02:23:16 UTC\r
+Last updated 30-Apr-2008 08:42:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fsck.html b/git-fsck.html
index 452e2418427697bd41e475725ce6abecaa649744..16d803a7c57b4deebddf2a3642274a56b6e77302 100644 (file)
--- a/git-fsck.html
+++ b/git-fsck.html
@@ -291,7 +291,8 @@ git-fsck(1) Manual Page
         An object to treat as the head of an unreachability trace.\r
 </p>\r
 <p>If no objects are given, git-fsck defaults to using the\r
-index file and all SHA1 references in .git/refs/* as heads.</p>\r
+index file, all SHA1 references in .git/refs/*, and all reflogs (unless\r
+--no-reflogs is given) as heads.</p>\r
 </dd>\r
 <dt>\r
 --unreachable\r
@@ -521,7 +522,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:22 UTC\r
+Last updated 30-Apr-2008 08:42:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fsck.txt b/git-fsck.txt
index f16cb986122c8560622bfbceebc325ee4d27b768..4cc26fb744e892115d8bfa099e48acc102a8689b 100644 (file)
--- a/git-fsck.txt
+++ b/git-fsck.txt
@@ -22,7 +22,8 @@ OPTIONS
        An object to treat as the head of an unreachability trace.
 +
 If no objects are given, git-fsck defaults to using the
-index file and all SHA1 references in .git/refs/* as heads.
+index file, all SHA1 references in .git/refs/*, and all reflogs (unless
+--no-reflogs is given) as heads.
 
 --unreachable::
        Print out objects that exist but that aren't readable from any

diff --git a/git-prune.html b/git-prune.html
index 49b51b4c6442fe3e89951232fe0e1cecf93f4826..403d23cc2a3e7588220a2798f1dc96a9b009c421 100644 (file)
--- a/git-prune.html
+++ b/git-prune.html
@@ -276,6 +276,15 @@ git-prune(1) Manual Page
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
+<div class="admonitionblock">\r
+<table><tr>\r
+<td class="icon">\r
+<div class="title">Note</div>\r
+</td>\r
+<td class="content">In most cases, users should run <a href="git-gc.html">git-gc(1)</a>, which calls\r
+git-prune. See the section "NOTES", below.</td>\r
+</tr></table>\r
+</div>\r
 <p>This runs <tt>git-fsck --unreachable</tt> using all the refs\r
 available in <tt>$GIT_DIR/refs</tt>, optionally with additional set of\r
 objects specified on the command line, and prunes all\r
@@ -334,6 +343,20 @@ borrows from your repository via its
 <pre><tt>$ git prune $(cd ../another &amp;&amp; $(git-rev-parse --all))</tt></pre>\r
 </div></div>\r
 </div>\r
+<h2>Notes</h2>\r
+<div class="sectionbody">\r
+<p>In most cases, users will not need to call git-prune directly, but\r
+should instead call <a href="git-gc.html">git-gc(1)</a>, which handles pruning along with\r
+many other housekeeping tasks.</p>\r
+<p>For a description of which objects are considered for pruning, see\r
+git-fsck's --unreachable option.</p>\r
+</div>\r
+<h2>See Also</h2>\r
+<div class="sectionbody">\r
+<p><a href="git-fsck.html">git-fsck(1)</a>,\r
+<a href="git-gc.html">git-gc(1)</a>,\r
+<a href="git-reflog.html">git-reflog(1)</a></p>\r
+</div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>\r
@@ -348,7 +371,7 @@ borrows from your repository via its
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:36 UTC\r
+Last updated 30-Apr-2008 08:42:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-prune.txt b/git-prune.txt
index f151cff5d968e5ed7f66a78d21ac74f74b3d4737..f92bb8cfa069283b0e8b78b717eedbef81bbe647 100644 (file)
--- a/git-prune.txt
+++ b/git-prune.txt
@@ -13,6 +13,9 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
+NOTE: In most cases, users should run linkgit:git-gc[1], which calls
+git-prune. See the section "NOTES", below.
+
 This runs `git-fsck --unreachable` using all the refs
 available in `$GIT_DIR/refs`, optionally with additional set of
 objects specified on the command line, and prunes all
@@ -50,6 +53,23 @@ borrows from your repository via its
 $ git prune $(cd ../another && $(git-rev-parse --all))
 ------------
 
+Notes
+-----
+
+In most cases, users will not need to call git-prune directly, but
+should instead call linkgit:git-gc[1], which handles pruning along with
+many other housekeeping tasks.
+
+For a description of which objects are considered for pruning, see
+git-fsck's --unreachable option.
+
+See Also
+--------
+
+linkgit:git-fsck[1],
+linkgit:git-gc[1],
+linkgit:git-reflog[1]
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index 2cdd7f8d80fb4adf5cad32dc62aa06345abea239..a4f691ac3025d852425d2b022a78bb80b8989add 100644 (file)
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -272,7 +272,7 @@ git-unpack-objects(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-unpack-objects</em> [-n] [-q] [-r] &lt;pack-file</p>\r
+<p><em>git-unpack-objects</em> [-n] [-q] [-r] [--strict] &lt;pack-file</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -341,7 +341,7 @@ new packs and replace existing ones.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Apr-2008 09:38:28 UTC\r
+Last updated 30-Apr-2008 08:42:08 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt
index 3697896a06b460d9d29f962240dc46388487990a..50947c50df1fe05b7eac8e046556c6ee070c7327 100644 (file)
--- a/git-unpack-objects.txt
+++ b/git-unpack-objects.txt
@@ -8,7 +8,7 @@ git-unpack-objects - Unpack objects from a packed archive
 
 SYNOPSIS
 --------
-'git-unpack-objects' [-n] [-q] [-r] <pack-file
+'git-unpack-objects' [-n] [-q] [-r] [--strict] <pack-file
 
 
 DESCRIPTION

diff --git a/git.html b/git.html
index 17e02dee37b2c250846d61c99f322432b7674db8..f02fdf01b02606a50d52af58906149661271956d 100644 (file)
--- a/git.html
+++ b/git.html
@@ -354,7 +354,8 @@ help &#8230;</em>.</p>
 <dd>\r
 <p>\r
         Set the path to the repository. This can also be controlled by\r
-        setting the GIT_DIR environment variable.\r
+        setting the GIT_DIR environment variable. It can be an absolute\r
+        path or relative path to current working directory.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -367,7 +368,12 @@ help &#8230;</em>.</p>
         a .git directory (i.e. $GIT_DIR is not set).\r
         This can also be controlled by setting the GIT_WORK_TREE\r
         environment variable and the core.worktree configuration\r
-        variable.\r
+        variable. It can be an absolute path or relative path to\r
+        the directory specified by --git-dir or GIT_DIR.\r
+        Note: If --git-dir or GIT_DIR are specified but none of\r
+        --work-tree, GIT_WORK_TREE and core.worktree is specified,\r
+        the current working directory is regarded as the top directory\r
+        of your working tree.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1946,7 +1952,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Apr-2008 00:47:32 UTC\r
+Last updated 30-Apr-2008 08:42:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index a070e078e75389d1ea252b8f1b80bb5bc707e1aa..6f445b1e3bbefccdb865f8cb93fb470892b94e41 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -143,7 +143,8 @@ help ...'.
 
 --git-dir=<path>::
        Set the path to the repository. This can also be controlled by
-       setting the GIT_DIR environment variable.
+       setting the GIT_DIR environment variable. It can be an absolute
+       path or relative path to current working directory.
 
 --work-tree=<path>::
        Set the path to the working tree.  The value will not be
@@ -151,7 +152,12 @@ help ...'.
        a .git directory (i.e. $GIT_DIR is not set).
        This can also be controlled by setting the GIT_WORK_TREE
        environment variable and the core.worktree configuration
-       variable.
+       variable. It can be an absolute path or relative path to
+       the directory specified by --git-dir or GIT_DIR.
+       Note: If --git-dir or GIT_DIR are specified but none of
+       --work-tree, GIT_WORK_TREE and core.worktree is specified,
+       the current working directory is regarded as the top directory
+       of your working tree.
 
 --bare::
        Treat the repository as a bare repository.  If GIT_DIR

diff --git a/gitk.html b/gitk.html
index 9e7b724d0f606cf6b18dd7f886497f05af67f180..de583ce3862abaa186ccf73e7bf5b5590e6f49a9 100644 (file)
--- a/gitk.html
+++ b/gitk.html
@@ -322,6 +322,16 @@ frequently used options.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--merge\r
+</dt>\r
+<dd>\r
+<p>\r
+        After an attempt to merge stops with conflicts, show the commits on\r
+        the history between two branches (i.e. the HEAD and the MERGE_HEAD)\r
+        that modify the conflicted files.\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;revs&gt;\r
 </dt>\r
 <dd>\r
@@ -430,7 +440,7 @@ such as display options, font, and colors.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Apr-2008 05:32:58 UTC\r
+Last updated 30-Apr-2008 08:42:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/gitk.txt b/gitk.txt
index ed3ba83c530411801dd1cd8980cad4d005962690..50d12da89fca37b60a024aeb2ac6de9cb2daf001 100644 (file)
--- a/gitk.txt
+++ b/gitk.txt
@@ -41,6 +41,12 @@ frequently used options.
 
        Show all branches.
 
+--merge::
+
+       After an attempt to merge stops with conflicts, show the commits on
+       the history between two branches (i.e. the HEAD and the MERGE_HEAD)
+       that modify the conflicted files.
+
 <revs>::
 
        Limit the revisions to show. This can be either a single revision