Autogenerated HTML docs for v1.4.4.3-gfa39b

diff --git a/git-branch.html b/git-branch.html
index 74a4e26d1361b7b4d41b80e636ad3a276a0adc93..f9cf223ad0fb0a7d284f980137a7f8d0e5075d20 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -276,7 +276,7 @@ git-branch(1) Manual Page
 <div class="content"><em>git-branch</em> [-r | -a] [-v [--abbrev=&lt;length&gt;]]\r
 <em>git-branch</em> [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]\r
 <em>git-branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;\r
-<em>git-branch</em> (-d | -D) &lt;branchname&gt;&#8230;</div></div>\r
+<em>git-branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -295,7 +295,8 @@ renaming. If &lt;newbranch&gt; exists, -M must be used to force the rename
 to happen.</p>\r
 <p>With a <tt>-d</tt> or <tt>-D</tt> option, <tt>&lt;branchname&gt;</tt> will be deleted.  You may\r
 specify more than one branch for deletion.  If the branch currently\r
-has a ref log then the ref log will also be deleted.</p>\r
+has a ref log then the ref log will also be deleted. Use -r together with -d\r
+to delete remote-tracking branches.</p>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -355,7 +356,7 @@ has a ref log then the ref log will also be deleted.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        List the remote-tracking branches.\r
+        List or delete (if used with -d) the remote-tracking branches.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -454,12 +455,18 @@ Delete unneeded branch
 <div class="content">\r
 <pre><tt>$ git clone git://git.kernel.org/.../git.git my.git\r
 $ cd my.git\r
-$ git branch -D todo    <b>(1)</b></tt></pre>\r
+$ git branch -d -r todo html man   <b>(1)</b>\r
+$ git branch -D test               <b>(2)</b></tt></pre>\r
 </div></div>\r
 <ol>\r
 <li>\r
 <p>\r
-delete todo branch even if the "master" branch does not have all\r
+delete remote-tracking branches "todo", "html", "man"\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+delete "test" branch even if the "master" branch does not have all\r
 commits from todo branch.\r
 </p>\r
 </li>\r
@@ -487,7 +494,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 13-Dec-2006 21:32:04 UTC\r
+Last updated 22-Dec-2006 07:28:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index 71417feba8f4987bb9d7565ec58f82044d343283..c464bd2fda2e4828d2e5a36ca05b4c66ad592f7c 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git-branch' [-r | -a] [-v [--abbrev=<length>]]
 'git-branch' [-l] [-f] <branchname> [<start-point>]
 'git-branch' (-m | -M) [<oldbranch>] <newbranch>
-'git-branch' (-d | -D) <branchname>...
+'git-branch' (-d | -D) [-r] <branchname>...
 
 DESCRIPTION
 -----------
@@ -33,7 +33,8 @@ to happen.
 
 With a `-d` or `-D` option, `<branchname>` will be deleted.  You may
 specify more than one branch for deletion.  If the branch currently
-has a ref log then the ref log will also be deleted.
+has a ref log then the ref log will also be deleted. Use -r together with -d
+to delete remote-tracking branches.
 
 
 OPTIONS
@@ -60,7 +61,7 @@ OPTIONS
        Move/rename a branch even if the new branchname already exists.
 
 -r::
-       List the remote-tracking branches.
+       List or delete (if used with -d) the remote-tracking branches.
 
 -a::
        List both remote-tracking branches and local branches.
@@ -111,10 +112,12 @@ Delete unneeded branch::
 ------------
 $ git clone git://git.kernel.org/.../git.git my.git
 $ cd my.git
-$ git branch -D todo    <1>
+$ git branch -d -r todo html man   <1>
+$ git branch -D test               <2>
 ------------
 +
-<1> delete todo branch even if the "master" branch does not have all
+<1> delete remote-tracking branches "todo", "html", "man"
+<2> delete "test" branch even if the "master" branch does not have all
 commits from todo branch.
 
 

diff --git a/git-tag.html b/git-tag.html
index fe9fa9769472a8980942b8d383c48c24cd124f0a..5977f477595d7e2210da3b4540788dd5cc0a8e8e 100644 (file)
--- a/git-tag.html
+++ b/git-tag.html
@@ -273,7 +273,8 @@ git-tag(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-tag</em> [-a | -s | -u &lt;key-id&gt;] [-f | -d] [-m &lt;msg&gt;] &lt;name&gt; [&lt;head&gt;]\r
+<div class="content"><em>git-tag</em> [-a | -s | -u &lt;key-id&gt;] [-f | -d] [-m &lt;msg&gt; | -F &lt;file&gt;]\r
+         &lt;name&gt; [&lt;head&gt;]\r
 <em>git-tag</em> -l [&lt;pattern&gt;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -354,6 +355,15 @@ if no pattern is given).</p>
         Use the given tag message (instead of prompting)\r
 </p>\r
 </dd>\r
+<dt>\r
+-F &lt;file&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Take the tag message from the given file.  Use <em>-</em> to\r
+        read the message from the standard input.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -371,7 +381,7 @@ Junio C Hamano &lt;junkio@cox.net&gt; and Chris Wright &lt;chrisw@osdl.org&gt;.<
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:33 UTC\r
+Last updated 22-Dec-2006 07:28:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tag.txt b/git-tag.txt
index 45476c2e415112347372f034276dec367f7a6a8d..48b82b86f83df4e3fb381da329b48fe12a4ce82d 100644 (file)
--- a/git-tag.txt
+++ b/git-tag.txt
@@ -9,7 +9,8 @@ git-tag - Create a tag object signed with GPG
 SYNOPSIS
 --------
 [verse]
-'git-tag' [-a | -s | -u <key-id>] [-f | -d] [-m <msg>] <name> [<head>]
+'git-tag' [-a | -s | -u <key-id>] [-f | -d] [-m <msg> | -F <file>]
+        <name> [<head>]
 'git-tag' -l [<pattern>]
 
 DESCRIPTION
@@ -60,6 +61,9 @@ OPTIONS
 -m <msg>::
        Use the given tag message (instead of prompting)
 
+-F <file>::
+       Take the tag message from the given file.  Use '-' to
+       read the message from the standard input.
 
 Author
 ------