Autogenerated HTML docs for v1.5.5.1-211-g65ea

diff --git a/config.txt b/config.txt
index a6fc5a2cfd96bc4d26f42637721f5f9eb2f73e7e..217980f48d9d9ac71860d61313e9afa9c6b7c332 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -399,6 +399,21 @@ branch.autosetupmerge::
        done when the starting point is either a local branch or remote
        branch. This option defaults to true.
 
+branch.autosetuprebase::
+       When a new branch is created with `git-branch` or `git-checkout`
+       that tracks another branch, this variable tells git to set
+       up pull to rebase instead of merge (see "branch.<name>.rebase").
+       When `never`, rebase is never automatically set to true.
+       When `local`, rebase is set to true for tracked branches of
+       other local branches.
+       When `remote`, rebase is set to true for tracked branches of
+       remote branches.
+       When `always`, rebase will be set to true for all tracking
+       branches.
+       See "branch.autosetupmerge" for details on how to set up a
+       branch to track another branch.
+       This option defaults to never.
+
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.
        If this option is not given, `git fetch` defaults to remote "origin".

diff --git a/git-config.html b/git-config.html
index 98b07b0d7d2adc71b54e470931585a0e8d177ec5..a6db05dd4e46bf98acc7841a4abd2f18d16f9a9e 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1228,6 +1228,26 @@ branch.autosetupmerge
 </p>\r
 </dd>\r
 <dt>\r
+branch.autosetuprebase\r
+</dt>\r
+<dd>\r
+<p>\r
+        When a new branch is created with <tt>git-branch</tt> or <tt>git-checkout</tt>\r
+        that tracks another branch, this variable tells git to set\r
+        up pull to rebase instead of merge (see "branch.&lt;name&gt;.rebase").\r
+        When <tt>never</tt>, rebase is never automatically set to true.\r
+        When <tt>local</tt>, rebase is set to true for tracked branches of\r
+        other local branches.\r
+        When <tt>remote</tt>, rebase is set to true for tracked branches of\r
+        remote branches.\r
+        When <tt>always</tt>, rebase will be set to true for all tracking\r
+        branches.\r
+        See "branch.autosetupmerge" for details on how to set up a\r
+        branch to track another branch.\r
+        This option defaults to never.\r
+</p>\r
+</dd>\r
+<dt>\r
 branch.&lt;name&gt;.remote\r
 </dt>\r
 <dd>\r
@@ -2531,7 +2551,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-May-2008 05:45:36 UTC\r
+Last updated 12-May-2008 00:29:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.html b/git-format-patch.html
index bf7c6bcee561d8cff3486617a957be9610d51ed7..844ec36ef54a3f756c9bece50617475d91e96dab 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -974,6 +974,17 @@ want a filename like <tt>0001-description-of-my-change.patch</tt>, and
 the first letter does not have to be a dot.  Leaving it empty would\r
 not add any suffix.</p>\r
 </dd>\r
+<dt>\r
+--no-binary\r
+</dt>\r
+<dd>\r
+<p>\r
+        Don't output contents of changes in binary files, just take note\r
+        that they differ.  Note that this disable the patch to be properly\r
+        applied.  By default the contents of changes in those files are\r
+        encoded in the patch.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>CONFIGURATION</h2>\r
@@ -1068,7 +1079,7 @@ as e-mailable patches:
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-May-2008 05:45:37 UTC\r
+Last updated 12-May-2008 00:29:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.txt b/git-format-patch.txt
index 87e491b59e0b5c2c2d9b334f8b9ad7a853b0915f..7548a21d352f0625a114f48c3063612f2a063436 100644 (file)
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -156,6 +156,12 @@ want a filename like `0001-description-of-my-change.patch`, and
 the first letter does not have to be a dot.  Leaving it empty would
 not add any suffix.
 
+--no-binary::
+       Don't output contents of changes in binary files, just take note
+       that they differ.  Note that this disable the patch to be properly
+       applied.  By default the contents of changes in those files are
+       encoded in the patch.
+
 CONFIGURATION
 -------------
 You can specify extra mail header lines to be added to each message

diff --git a/git-svn.html b/git-svn.html
index 26d4d09ab3eefebd7453a213e1fbf19e2db8bc69..2db4ab83d29fdca410df684a3fbceba923964ad3 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -570,11 +570,26 @@ environment). This command has the same behaviour.</td>
 </dt>\r
 <dd>\r
 <p>\r
-       Show what revision and author last modified each line of a file. This is\r
-       identical to `git blame', but SVN revision numbers are shown instead of git\r
-       commit hashes.\r
+       Show what revision and author last modified each line of a file. The\r
+       output of this mode is format-compatible with the output of\r
+       `svn blame' by default. Like the SVN blame command,\r
+       local uncommitted changes in the working copy are ignored;\r
+       the version of the file in the HEAD revision is annotated. Unknown\r
+       arguments are passed directly to git-blame.\r
 </p>\r
-<p>All arguments are passed directly to `git blame'.</p>\r
+<dl>\r
+<dt>\r
+--git-format\r
+</dt>\r
+<dd>\r
+<p>\r
+        Produce output in the same format as `git blame', but with\r
+        SVN revision numbers instead of git commit hashes. In this mode,\r
+        changes that haven't been committed to SVN (including local\r
+        working-copy edits) are shown as revision 0.\r
+</p>\r
+</dd>\r
+</dl>\r
 </dd>\r
 </dl>\r
 <dl>\r
@@ -1105,7 +1120,7 @@ should be manually entered with a text-editor or using
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 06-May-2008 06:34:59 UTC\r
+Last updated 12-May-2008 00:29:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.txt b/git-svn.txt
index f4ba1056f0cab8d121a94797349a0bd789704580..c6b56b4ef35879124f9e1bb8468a59761d09cb3b 100644 (file)
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -166,11 +166,18 @@ environment). This command has the same behaviour.
 Any other arguments are passed directly to `git log'
 
 'blame'::
-       Show what revision and author last modified each line of a file. This is
-       identical to `git blame', but SVN revision numbers are shown instead of git
-       commit hashes.
+       Show what revision and author last modified each line of a file. The
+       output of this mode is format-compatible with the output of
+       `svn blame' by default. Like the SVN blame command,
+       local uncommitted changes in the working copy are ignored;
+       the version of the file in the HEAD revision is annotated. Unknown
+       arguments are passed directly to git-blame.
 +
-All arguments are passed directly to `git blame'.
+--git-format;;
+       Produce output in the same format as `git blame', but with
+       SVN revision numbers instead of git commit hashes. In this mode,
+       changes that haven't been committed to SVN (including local
+       working-copy edits) are shown as revision 0.
 
 --
 'find-rev'::