Autogenerated HTML docs for v1.5.5.1-147-g867f

diff --git a/config.txt b/config.txt
index 824e416e9f8157d54d3f37e0e520fff5f9a125c0..00f089fee4178b8d402307979b8adc898af6fdc7 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -921,6 +921,10 @@ remote.<name>.push::
        The default set of "refspec" for linkgit:git-push[1]. See
        linkgit:git-push[1].
 
+remote.<name>.mirror::
+       If true, pushing to this remote will automatically behave
+       as if the `\--mirror` option was given on the command line.
+
 remote.<name>.skipDefaultUpdate::
        If true, this remote will be skipped by default when updating
        using the update subcommand of linkgit:git-remote[1].

diff --git a/git-branch.html b/git-branch.html
index 6e1bc8bd0ff3152e6a21bf49c1c8034fc0980626..17c0471275db5c628d953dd3ae3066f5f556800f 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -273,7 +273,7 @@ git-branch(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-branch</em> [--color | --no-color] [-r | -a]\r
+<div class="content"><em>git-branch</em> [--color | --no-color] [-r | -a] [--merged | --no-merged]\r
            [-v [--abbrev=&lt;length&gt; | --no-abbrev]]\r
            [--contains &lt;commit&gt;]\r
 <em>git-branch</em> [--track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]\r
@@ -288,7 +288,9 @@ Option <tt>-r</tt> causes the remote-tracking branches to be listed,
 and option <tt>-a</tt> shows both.\r
 With <tt>--contains &lt;commit&gt;</tt>, shows only the branches that\r
 contains the named commit (in other words, the branches whose\r
-tip commits are descendant of the named commit).</p>\r
+tip commits are descendant of the named commit).\r
+With <tt>--merged</tt>, only branches merged into HEAD will be listed, and\r
+with <tt>--no-merged</tt> only branches not merged into HEAD will be listed.</p>\r
 <p>In its second form, a new branch named &lt;branchname&gt; will be created.\r
 It will start out with a head equal to the one given as &lt;start-point&gt;.\r
 If no &lt;start-point&gt; is given, the branch will be created with a head\r
@@ -453,6 +455,30 @@ clean up all obsolete remote-tracking branches.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--contains &lt;commit&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Only list branches which contain the specified commit.\r
+</p>\r
+</dd>\r
+<dt>\r
+--merged\r
+</dt>\r
+<dd>\r
+<p>\r
+        Only list branches which are fully contained by HEAD.\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-merged\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do not list branches which are fully contained by HEAD.\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;branchname&gt;\r
 </dt>\r
 <dd>\r
@@ -549,6 +575,29 @@ currently checked out) does not have all commits from test branch.
 <p>If you are creating a branch that you want to immediately checkout, it's\r
 easier to use the git checkout command with its <tt>-b</tt> option to create\r
 a branch and check it out with a single command.</p>\r
+<p>The options <tt>--contains</tt>, <tt>--merged</tt> and <tt>--no-merged</tt> serves three related\r
+but different purposes:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+<tt>--contains &lt;commit&gt;</tt> is used to find all branches which will need\r
+  special attention if &lt;commit&gt; were to be rebased or amended, since those\r
+  branches contain the specified &lt;commit&gt;.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>--merged</tt> is used to find all branches which can be safely deleted,\r
+  since those branches are fully contained by HEAD.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<tt>--no-merged</tt> is used to find branches which are candidates for merging\r
+  into HEAD, since those branches are not fully contained by HEAD.\r
+</p>\r
+</li>\r
+</ul>\r
 </div>\r
 <h2>Author</h2>\r
 <div class="sectionbody">\r
@@ -564,7 +613,7 @@ a branch and check it out with a single command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Feb-2008 00:25:37 UTC\r
+Last updated 06-May-2008 06:34:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index 6f07a17a2c310a67f23034c520ab10670407c006..c824d887420754f98db0553a006865d31d01cf1d 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -8,7 +8,7 @@ git-branch - List, create, or delete branches
 SYNOPSIS
 --------
 [verse]
-'git-branch' [--color | --no-color] [-r | -a]
+'git-branch' [--color | --no-color] [-r | -a] [--merged | --no-merged]
           [-v [--abbrev=<length> | --no-abbrev]]
           [--contains <commit>]
 'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
@@ -24,6 +24,8 @@ and option `-a` shows both.
 With `--contains <commit>`, shows only the branches that
 contains the named commit (in other words, the branches whose
 tip commits are descendant of the named commit).
+With `--merged`, only branches merged into HEAD will be listed, and
+with `--no-merged` only branches not merged into HEAD will be listed.
 
 In its second form, a new branch named <branchname> will be created.
 It will start out with a head equal to the one given as <start-point>.
@@ -118,6 +120,15 @@ OPTIONS
 --no-track::
        Ignore the branch.autosetupmerge configuration variable.
 
+--contains <commit>::
+       Only list branches which contain the specified commit.
+
+--merged::
+       Only list branches which are fully contained by HEAD.
+
+--no-merged::
+       Do not list branches which are fully contained by HEAD.
+
 <branchname>::
        The name of the branch to create or delete.
        The new branch name must pass all checks defined by
@@ -175,6 +186,18 @@ If you are creating a branch that you want to immediately checkout, it's
 easier to use the git checkout command with its `-b` option to create
 a branch and check it out with a single command.
 
+The options `--contains`, `--merged` and `--no-merged` serves three related
+but different purposes:
+
+- `--contains <commit>` is used to find all branches which will need
+  special attention if <commit> were to be rebased or amended, since those
+  branches contain the specified <commit>.
+
+- `--merged` is used to find all branches which can be safely deleted,
+  since those branches are fully contained by HEAD.
+
+- `--no-merged` is used to find branches which are candidates for merging
+  into HEAD, since those branches are not fully contained by HEAD.
 
 Author
 ------

diff --git a/git-config.html b/git-config.html
index f8cf71a078c8f09ff9f21ca94f63f628c5ff32de..dda9357f5dc838bc4abcde2eef8d35a626d2cce6 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -2195,6 +2195,15 @@ remote.<name>.push
 </p>\r
 </dd>\r
 <dt>\r
+remote.&lt;name&gt;.mirror\r
+</dt>\r
+<dd>\r
+<p>\r
+        If true, pushing to this remote will automatically behave\r
+        as if the <tt>--mirror</tt> option was given on the command line.\r
+</p>\r
+</dd>\r
+<dt>\r
 remote.&lt;name&gt;.skipDefaultUpdate\r
 </dt>\r
 <dd>\r
@@ -2428,7 +2437,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 30-Apr-2008 08:42:07 UTC\r
+Last updated 06-May-2008 06:34:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-filter-branch.html b/git-filter-branch.html
index 0628c213a750bacfd4be5e06a1616c1725eda4a9..3c7d6000a1ed45a97459bc943d6e25702d1425ec 100644 (file)
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -419,10 +419,16 @@ that, use <a href="git-rebase.html">git-rebase(1)</a> instead).</p>
 use "--tag-name-filter cat" to simply update the tags.  In this\r
 case, be very careful and make sure you have the old tags\r
 backed up in case the conversion has run afoul.</p>\r
-<p>Note that there is currently no support for proper rewriting of\r
-tag objects; in layman terms, if the tag has a message or signature\r
-attached, the rewritten tag won't have it.  Sorry.  (It is by\r
-definition impossible to preserve signatures at any rate.)</p>\r
+<p>Nearly proper rewriting of tag objects is supported. If the tag has\r
+a message attached, a new tag object will be created with the same message,\r
+author, and timestamp. If the tag has a signature attached, the\r
+signature will be stripped. It is by definition impossible to preserve\r
+signatures. The reason this is "nearly" proper, is because ideally if\r
+the tag did not change (points to the same object, has the same name, etc.)\r
+it should retain any signature. That is not the case, signatures will always\r
+be removed, buyer beware. There is also no support for changing the\r
+author or timestamp (or the tag message for that matter). Tags which point\r
+to other tags will be rewritten to point to the underlying commit.</p>\r
 </dd>\r
 <dt>\r
 --subdirectory-filter &lt;directory&gt;\r
@@ -605,7 +611,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-May-2008 06:41:00 UTC\r
+Last updated 06-May-2008 06:34:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index 6454e49bf2805fcf0a000ed6f96ff9f73d718299..8d80f0d074c92fccc2a9746c5f374c1626fdde97 100644 (file)
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -133,10 +133,16 @@ use "--tag-name-filter cat" to simply update the tags.  In this
 case, be very careful and make sure you have the old tags
 backed up in case the conversion has run afoul.
 +
-Note that there is currently no support for proper rewriting of
-tag objects; in layman terms, if the tag has a message or signature
-attached, the rewritten tag won't have it.  Sorry.  (It is by
-definition impossible to preserve signatures at any rate.)
+Nearly proper rewriting of tag objects is supported. If the tag has
+a message attached, a new tag object will be created with the same message,
+author, and timestamp. If the tag has a signature attached, the
+signature will be stripped. It is by definition impossible to preserve
+signatures. The reason this is "nearly" proper, is because ideally if
+the tag did not change (points to the same object, has the same name, etc.)
+it should retain any signature. That is not the case, signatures will always
+be removed, buyer beware. There is also no support for changing the
+author or timestamp (or the tag message for that matter). Tags which point
+to other tags will be rewritten to point to the underlying commit.
 
 --subdirectory-filter <directory>::
        Only look at the history which touches the given subdirectory.

diff --git a/git-push.html b/git-push.html
index 67862c71625bbd9c54287060831325ed1f23fc6e..cd77cd3bc35163c1357b4388860a1db41a4a7cc0 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -345,7 +345,9 @@ the remote repository.</p>
         be mirrored to the remote repository.  Newly created local\r
         refs will be pushed to the remote end, locally updated refs\r
         will be force updated on the remote end, and deleted refs\r
-        will be removed from the remote end.\r
+        will be removed from the remote end.  This is the default\r
+        if the configuration option <tt>remote.&lt;remote&gt;.mirror</tt> is\r
+        set.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -730,7 +732,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Apr-2008 16:08:37 UTC\r
+Last updated 06-May-2008 06:34:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.txt b/git-push.txt
index 05859491378243639e81c9c8ab7deffb90d83d07..f06d94e318d6d0bf918430bafc746e96a2abe7a1 100644 (file)
--- a/git-push.txt
+++ b/git-push.txt
@@ -70,7 +70,9 @@ the remote repository.
        be mirrored to the remote repository.  Newly created local
        refs will be pushed to the remote end, locally updated refs
        will be force updated on the remote end, and deleted refs
-       will be removed from the remote end.
+       will be removed from the remote end.  This is the default
+       if the configuration option `remote.<remote>.mirror` is
+       set.
 
 \--dry-run::
        Do everything except actually send the updates.

diff --git a/git-remote.html b/git-remote.html
index 3752113718641a6f9208473ecb5149aacd9db57d..f41e9ff8a4947dbe86691336b5700765ad107aaf 100644 (file)
--- a/git-remote.html
+++ b/git-remote.html
@@ -310,7 +310,9 @@ up to point at remote's <tt>&lt;master&gt;</tt> branch instead of whatever
 branch the <tt>HEAD</tt> at the remote repository actually points at.</p>\r
 <p>In mirror mode, enabled with <tt>--mirror</tt>, the refs will not be stored\r
 in the <em>refs/remotes/</em> namespace, but in <em>refs/heads/</em>.  This option\r
-only makes sense in bare repositories.</p>\r
+only makes sense in bare repositories.  If a remote uses mirror\r
+mode, furthermore, <tt>git push</tt> will always behave as if <tt>--mirror</tt>\r
+was passed.</p>\r
 </dd>\r
 <dt>\r
 <em>rm</em>\r
@@ -428,7 +430,7 @@ $ git merge origin</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Feb-2008 01:07:25 UTC\r
+Last updated 06-May-2008 06:34:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-remote.txt b/git-remote.txt
index 2cbd1f764b7d4d8e8c026f50b727c6cc70f5158e..b20e851973ae6ae1cee17b76f3002f77cd3a3329 100644 (file)
--- a/git-remote.txt
+++ b/git-remote.txt
@@ -47,9 +47,11 @@ With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set
 up to point at remote's `<master>` branch instead of whatever
 branch the `HEAD` at the remote repository actually points at.
 +
-In mirror mode, enabled with `--mirror`, the refs will not be stored
+In mirror mode, enabled with `\--mirror`, the refs will not be stored
 in the 'refs/remotes/' namespace, but in 'refs/heads/'.  This option
-only makes sense in bare repositories.
+only makes sense in bare repositories.  If a remote uses mirror
+mode, furthermore, `git push` will always behave as if `\--mirror`
+was passed.
 
 'rm'::
 

diff --git a/git-svn.html b/git-svn.html
index c5b2af3a363de50d7ed67728fd1661da49e1c184..26d4d09ab3eefebd7453a213e1fbf19e2db8bc69 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -604,6 +604,16 @@ environment). This command has the same behaviour.</td>
 </p>\r
 </dd>\r
 <dt>\r
+<em>create-ignore</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Recursively finds the svn:ignore property on directories and\r
+        creates matching .gitignore files. The resulting files are staged to\r
+        be committed, but are not committed.\r
+</p>\r
+</dd>\r
+<dt>\r
 <em>show-ignore</em>\r
 </dt>\r
 <dd>\r
@@ -1095,7 +1105,7 @@ should be manually entered with a text-editor or using
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Feb-2008 00:25:44 UTC\r
+Last updated 06-May-2008 06:34:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.txt b/git-svn.txt
index bec9accc8915c712bdea5e8975598e4f26db633f..f4ba1056f0cab8d121a94797349a0bd789704580 100644 (file)
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -188,6 +188,12 @@ All arguments are passed directly to `git blame'.
        commit.  All merging is assumed to have taken place
        independently of git-svn functions.
 
+'create-ignore'::
+
+       Recursively finds the svn:ignore property on directories and
+       creates matching .gitignore files. The resulting files are staged to
+       be committed, but are not committed.
+
 'show-ignore'::
        Recursively finds and lists the svn:ignore property on
        directories.  The output is suitable for appending to

diff --git a/hooks.html b/hooks.html
index fd407d49a695ecdf30c76c05ceff4c71d181d38c..37665b7d3b385ad5a79a72915b6f769a7c78e1b7 100644 (file)
--- a/hooks.html
+++ b/hooks.html
@@ -374,7 +374,8 @@ properties.</p>
 <p>This hook is invoked by <tt>git-merge</tt>, which happens when a <tt>git pull</tt>\r
 is done on a local repository.  The hook takes a single parameter, a status\r
 flag specifying whether or not the merge being done was a squash merge.\r
-This hook cannot affect the outcome of <tt>git-merge</tt>.</p>\r
+This hook cannot affect the outcome of <tt>git-merge</tt> and is not executed,\r
+if the merge failed due to conflicts.</p>\r
 <p>This hook can be used in conjunction with a corresponding pre-commit hook to\r
 save and restore any form of metadata associated with the working tree\r
 (eg: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl\r
@@ -508,7 +509,7 @@ to abort.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-May-2008 06:41:00 UTC\r
+Last updated 06-May-2008 06:35:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/hooks.txt b/hooks.txt
index 1283ab4daac1cd929605a51f50d0a3b9beb11dc9..d89cc222610d01bd8b2a25681c6225cef51c2138 100644 (file)
--- a/hooks.txt
+++ b/hooks.txt
@@ -137,7 +137,8 @@ post-merge
 This hook is invoked by `git-merge`, which happens when a `git pull`
 is done on a local repository.  The hook takes a single parameter, a status
 flag specifying whether or not the merge being done was a squash merge.
-This hook cannot affect the outcome of `git-merge`.
+This hook cannot affect the outcome of `git-merge` and is not executed,
+if the merge failed due to conflicts.
 
 This hook can be used in conjunction with a corresponding pre-commit hook to
 save and restore any form of metadata associated with the working tree

diff --git a/repository-layout.html b/repository-layout.html
index 07eba6e4d865ca8e54dfa2065be085d88e77753a..3e4a9d9425239595a2e8a8e07c32141232000255 100644 (file)
--- a/repository-layout.html
+++ b/repository-layout.html
@@ -265,7 +265,10 @@ div.exampleblock-content {
 <div class="sectionbody">\r
 <p>You may find these things in your git repository (<tt>.git</tt>\r
 directory for a repository associated with your working tree, or\r
-<tt><em>project</em>.git</tt> directory for a public <em>bare</em> repository).</p>\r
+<tt><em>project</em>.git</tt> directory for a public <em>bare</em> repository. It is\r
+also possible to have a working tree where <tt>.git</tt> is a plain\r
+ascii file containing <tt>gitdir: &lt;path&gt;</tt>, i.e. the path to the\r
+real git repository).</p>\r
 <dl>\r
 <dt>\r
 objects\r
@@ -582,7 +585,7 @@ shallow
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:51:11 UTC\r
+Last updated 06-May-2008 06:35:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/repository-layout.txt b/repository-layout.txt
index 69391300944438576e11cff19b4ce1aa2215b97b..bbaed2e129fb9ced1752183099fdb40ea8e341b3 100644 (file)
--- a/repository-layout.txt
+++ b/repository-layout.txt
@@ -3,7 +3,10 @@ git repository layout
 
 You may find these things in your git repository (`.git`
 directory for a repository associated with your working tree, or
-`'project'.git` directory for a public 'bare' repository).
+`'project'.git` directory for a public 'bare' repository. It is
+also possible to have a working tree where `.git` is a plain
+ascii file containing `gitdir: <path>`, i.e. the path to the
+real git repository).
 
 objects::
        Object store associated with this repository.  Usually