Autogenerated HTML docs for v1.5.3

diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt
index 51ff53b370d909be01af8d264919b22195f4b8c1..317c8b9db6badda58278e1df43204b6997e331e4 100644 (file)
--- a/RelNotes-1.5.3.txt
+++ b/RelNotes-1.5.3.txt
@@ -122,6 +122,9 @@ Updates since v1.5.2
   - "git send-email" can be told not to thread the messages when
     sending out more than one patches.
 
+  - "git send-email" can also be told how to find whom to cc the
+    message to for each message via --cc-cmd.
+
   - "git config" learned NUL terminated output format via -z to
     help scripts.
 
@@ -148,6 +151,9 @@ Updates since v1.5.2
   - "git clone" uses -l (hardlink files under .git) by default when
     cloning locally.
 
+  - URL used for "git clone" and friends can specify nonstandard SSH port
+    by using sh://host:port/path/to/repo syntax.
+
   - "git bundle create" can now create a bundle without negative refs,
     i.e. "everything since the beginning up to certain points".
 
@@ -155,8 +161,13 @@ Updates since v1.5.2
     recursively descends into trees by default.
 
   - "git diff" does not show differences that come only from
-    stat-dirtiness in the form of "diff --git" header anymore.  When
-    generating a textual diff, it shows a warning message at the end.
+    stat-dirtiness in the form of "diff --git" header anymore.
+    It runs "update-index --refresh" silently as needed.
+
+  - "git tag -l" used to match tags by globbing its parameter as if it
+    has wildcard '*' on both ends, which made "git tag -l gui" to match
+    tag 'gitgui-0.7.0'; this was very annoying.  You now have to add
+    asterisk on the sides you want to wildcard yourself.
 
   - The editor to use with many interactive commands can be
     overridden with GIT_EDITOR environment variable, or if it
@@ -327,6 +338,13 @@ this release, unless otherwise noted.
   - "gitweb" had trouble handling non UTF-8 text with older
     Encode.pm Perl module.
 
+  - "git svn" misparsed the data from the commits in the repository when
+    the user had "color.diff = true" in the configuration.  This has been
+    fixed.
+
+  - There was a case where "git svn dcommit" clobbered changes made on the
+    SVN side while committing multiple changes.
+
   - "git-write-tree" had a bad interaction with racy-git avoidance and
     gitattributes mechanisms.
 
@@ -345,8 +363,4 @@ this release, unless otherwise noted.
     inconsistency was introduced somewhere in v1.3.0 series but now has
     been corrected.
 
---
-exec >/var/tmp/1
-O=v1.5.3-rc7-15-ga65f200
-echo O=`git describe refs/heads/master`
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
+  - "git rebase -m" incorrectly displayed commits that were skipped.

diff --git a/git-rebase.html b/git-rebase.html
index 515396b710f84cdd01a263e1b652d5e115889763..1599bd5a1fad70594110dc874c7e8a15553f551b 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -273,7 +273,7 @@ git-rebase(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [--merge] [-C&lt;n&gt;]\r
+<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge] [-C&lt;n&gt;]\r
         [-p | --preserve-merges] [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]\r
 <em>git-rebase</em> --continue | --skip | --abort</div></div>\r
 </div>\r
@@ -469,7 +469,7 @@ desired resolution, you can continue the rebasing process with</p>
 </p>\r
 </dd>\r
 <dt>\r
---merge\r
+-m, --merge\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -800,7 +800,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Sep-2007 11:16:26 UTC\r
+Last updated 02-Sep-2007 06:24:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index 640ea3b38df5360bb416f38ebaaf74cc35a44d3b..61b1810dbaa56bdc43364ea10d9a5ea0d532f1be 100644 (file)
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -8,7 +8,7 @@ git-rebase - Forward-port local commits to the updated upstream head
 SYNOPSIS
 --------
 [verse]
-'git-rebase' [-i | --interactive] [-v | --verbose] [--merge] [-C<n>]
+'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>]
        [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]
 'git-rebase' --continue | --skip | --abort
 
@@ -188,7 +188,7 @@ OPTIONS
 --skip::
        Restart the rebasing process by skipping the current patch.
 
---merge::
+-m, \--merge::
        Use merging strategies to rebase.  When the recursive (default) merge
        strategy is used, this allows rebase to be aware of renames on the
        upstream side.

diff --git a/git-send-email.html b/git-send-email.html
index 21e09fdfcb977341e386b4c2e9d8bfaa6819b7a1..262266e607c813cbf430cb78323beaf4a677bbd7 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -304,6 +304,17 @@ enabled interface to provide the necessary information.</p>
 <p>The --cc option must be repeated for each user you want on the cc list.</p>\r
 </dd>\r
 <dt>\r
+--cc-cmd\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specify a command to execute once per patch file which\r
+        should generate patch file specific "Cc:" entries.\r
+        Output of this command must be single email address per line.\r
+        Default is the value of <em>sendemail.cccmd</em> configuration value.\r
+</p>\r
+</dd>\r
+<dt>\r
 --chain-reply-to, --no-chain-reply-to\r
 </dt>\r
 <dd>\r
@@ -470,6 +481,14 @@ sendemail.aliasfiletype
 </p>\r
 </dd>\r
 <dt>\r
+sendemail.cccmd\r
+</dt>\r
+<dd>\r
+<p>\r
+        Command to execute to generate per patch file specific "Cc:"s.\r
+</p>\r
+</dd>\r
+<dt>\r
 sendemail.bcc\r
 </dt>\r
 <dd>\r
@@ -512,7 +531,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Aug-2007 02:20:20 UTC\r
+Last updated 02-Sep-2007 06:24:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 8231286e09eb462d86679569f6911767b00deaf4..16bfd7be2271d21d8d380e9f4e20307569f3a538 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -34,6 +34,12 @@ The --bcc option must be repeated for each user you want on the bcc list.
 +
 The --cc option must be repeated for each user you want on the cc list.
 
+--cc-cmd::
+       Specify a command to execute once per patch file which
+       should generate patch file specific "Cc:" entries.
+       Output of this command must be single email address per line.
+       Default is the value of 'sendemail.cccmd' configuration value.
+
 --chain-reply-to, --no-chain-reply-to::
        If this is set, each email will be sent as a reply to the previous
        email sent.  If disabled with "--no-chain-reply-to", all emails after
@@ -124,6 +130,9 @@ sendemail.aliasfiletype::
        Format of the file(s) specified in sendemail.aliasesfile. Must be
        one of 'mutt', 'mailrc', 'pine', or 'gnus'.
 
+sendemail.cccmd::
+       Command to execute to generate per patch file specific "Cc:"s.
+
 sendemail.bcc::
        Email address (or alias) to always bcc.