Autogenerated HTML docs for v1.5.0.2-204-gc260

diff --git a/RelNotes-1.5.0.2.txt b/RelNotes-1.5.0.2.txt
index 4dc1344859f68c0fd8692ccf2a8c516d4d3b6cc0..b061e50ff05b5e13211bb315e240974e898de32c 100644 (file)
--- a/RelNotes-1.5.0.2.txt
+++ b/RelNotes-1.5.0.2.txt
@@ -6,6 +6,14 @@ Fixes since v1.5.0.1
 
 * Bugfixes
 
+  - Automated merge conflict handling when changes to symbolic
+    links conflicted were completely broken.  The merge-resolve
+    strategy created a regular file with conflict markers in it
+    in place of the symbolic link.  The default strategy,
+    merge-recursive was even more broken.  It removed the path
+    that was pointed at by the symbolic link.  Both of these
+    problems have been fixed.
+
   - 'git diff maint master next' did not correctly give combined
     diff across three trees.
 
@@ -39,21 +47,19 @@ Fixes since v1.5.0.1
     impossible to repack after accumulating many (small) packs
     in the repository.
 
+  - 'git-diff' to review the combined diff during a conflicted
+    merge were not reading the working tree version correctly
+    when changes to a symbolic link conflicted.  It should have
+    read the data using readlink(2) but read from the regular
+    file the symbolic link pointed at.
+
+  - 'git-remote' did not like period in a remote's name.
+
 * Documentation updates
 
   - added and clarified core.bare, core.legacyheaders configurations.
 
   - updated "git-clone --depth" documentation.
 
-* Assorted git-gui fixes.
 
-
---
-exec >/var/tmp/1
-O=v1.5.0.1-35-gffa84ff
-echo O=`git describe maint`
-git shortlog --no-merges $O..maint
-
-#Local Variables:
-#mode: text
-#End:
+* Assorted git-gui fixes.

diff --git a/config.txt b/config.txt
index 6309d89b4bb9e6cefd868fb87dd78dfd3dd32d24..d2b4a05ca5849c59514c6f0e67c8b31ad444be9e 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -483,6 +483,10 @@ remote.<name>.uploadpack::
        The default program to execute on the remote side when fetching.  See
        option \--exec of gitlink:git-fetch-pack[1].
 
+remote.<name>.tagopt::
+       Setting this value to --no-tags disables automatic tag following when fetching
+       from remote <name>
+
 remotes.<group>::
        The list of remotes which are fetched by "git remote update
        <group>".  See gitlink:git-remote[1].

diff --git a/git-config.html b/git-config.html
index a92807766e4c4304856c87c29802b7f5ac0389b0..0ad4eabdc94709446944773d214c795cdd38c2bc 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1309,6 +1309,15 @@ remote.<name>.uploadpack
 </p>\r
 </dd>\r
 <dt>\r
+remote.&lt;name&gt;.tagopt\r
+</dt>\r
+<dd>\r
+<p>\r
+        Setting this value to --no-tags disables automatic tag following when fetching\r
+        from remote &lt;name&gt;\r
+</p>\r
+</dd>\r
+<dt>\r
 remotes.&lt;group&gt;\r
 </dt>\r
 <dd>\r
@@ -1460,7 +1469,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 24-Feb-2007 11:15:45 UTC\r
+Last updated 26-Feb-2007 09:50:07 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-remote.html b/git-remote.html
index e7a8a730e7fad9cadadb584b0634bc449f8bb6b1..ae6be137385fc48fdd587741d9ec415cfdb7f83e 100644 (file)
--- a/git-remote.html
+++ b/git-remote.html
@@ -297,6 +297,16 @@ Adds a remote named <name> for the repository at
 &lt;url&gt;.  The command <tt>git fetch &lt;name&gt;</tt> can then be used to create and\r
 update remote-tracking branches &lt;name&gt;/&lt;branch&gt;.\r
 </p>\r
+<p>With <tt>-f</tt> option, <tt>git fetch &lt;name&gt;</tt> is run immediately after\r
+the remote information is set up.</p>\r
+<p>With <tt>-t &lt;branch&gt;</tt> option, instead of the default glob\r
+refspec for the remote to track all branches under\r
+<tt>$GIT_DIR/remotes/&lt;name&gt;/</tt>, a refspec to track only <tt>&lt;branch&gt;</tt>\r
+is created.  You can give more than one <tt>-t &lt;branch&gt;</tt> to track\r
+multiple branche without grabbing all branches.</p>\r
+<p>With <tt>-m &lt;master&gt;</tt> option, <tt>$GIT_DIR/remotes/&lt;name&gt;/HEAD</tt> is set\r
+up to point at remote's <tt>&lt;master&gt;</tt> branch instead of whatever\r
+branch the <tt>HEAD</tt> at the remote repository actually points at.</p>\r
 </dd>\r
 <dt>\r
 <em>show</em>\r
@@ -381,7 +391,7 @@ $ git checkout -b nfs linux-nfs/master
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Feb-2007 20:23:57 UTC\r
+Last updated 26-Feb-2007 09:50:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-remote.txt b/git-remote.txt
index 250761f97ed9b43cf6cec9fb36e835ed80327cd5..266faade31ae646a419616fc0fce9d676f112d9d 100644 (file)
--- a/git-remote.txt
+++ b/git-remote.txt
@@ -32,6 +32,19 @@ subcommands are available to perform operations on the remotes.
 Adds a remote named <name> for the repository at
 <url>.  The command `git fetch <name>` can then be used to create and
 update remote-tracking branches <name>/<branch>.
++
+With `-f` option, `git fetch <name>` is run immediately after
+the remote information is set up.
++
+With `-t <branch>` option, instead of the default glob
+refspec for the remote to track all branches under
+`$GIT_DIR/remotes/<name>/`, a refspec to track only `<branch>`
+is created.  You can give more than one `-t <branch>` to track
+multiple branche without grabbing all branches.
++
+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.
 
 'show'::
 

diff --git a/git.html b/git.html
index 3e453694f45b99434853a318c69a1f4fd392092c..6bb8b417ea1675fb4a04dc6ad3a63632a20be797 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2290,7 +2290,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 23-Feb-2007 11:13:38 UTC\r
+Last updated 26-Feb-2007 09:50:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index aa3acc0466b66afaace22cff5e38ca650e9ae826..9a7474798963c22b554f49db015c180b9ae7ea4f 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -35,7 +35,9 @@ ifdef::stalenotes[]
 You are reading the documentation for the latest version of git.
 Documentation for older releases are available here:
 
-* link:v1.5.0.1/git.html[documentation for release 1.5.0.1]
+* link:v1.5.0.2/git.html[documentation for release 1.5.0.2]
+
+* link:v1.5.0.2/RelNotes-1.5.0.2.txt[release notes for 1.5.0.2]
 
 * link:v1.5.0.1/RelNotes-1.5.0.1.txt[release notes for 1.5.0.1]