Autogenerated HTML docs for v1.5.0.3-438-gc49b2

diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt
index 56d388ef739270a78b3f49141ad1c021139967a4..28d44fa991912198b9f2398b2ddb6a2d15a35e94 100644 (file)
--- a/cmds-ancillarymanipulators.txt
+++ b/cmds-ancillarymanipulators.txt
@@ -7,6 +7,9 @@ gitlink:git-fast-import[1]::
 gitlink:git-lost-found[1]::
        Recover lost refs that luckily have not yet been pruned.
 
+gitlink:git-mergetool[1]::
+       Run merge conflict resolution tools to resolve merge conflicts.
+
 gitlink:git-pack-refs[1]::
        Pack heads and tags for efficient repository access.
 

diff --git a/config.txt b/config.txt
index 5408dd67d316ce3334f2843267a604f5a4ea044b..aaae9ac3052b5a4de6ec53817e79797626f7da31 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -453,6 +453,11 @@ merge.summary::
        Whether to include summaries of merged commits in newly created
        merge commit messages. False by default.
 
+merge.tool::
+       Controls which merge resolution program is used by
+       gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
+       "meld", "xxdiff", "emerge"
+
 merge.verbosity::
        Controls the amount of output shown by the recursive merge
        strategy.  Level 0 outputs nothing except a final error

diff --git a/git-branch.html b/git-branch.html
index 937b288d14ed7874644373b2fa21ac9d278153d1..bd07c65315237d08f60ea63be65b88721ba89342 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -275,7 +275,7 @@ git-branch(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-branch</em> [--color | --no-color] [-r | -a]\r
            [-v [--abbrev=&lt;length&gt; | --no-abbrev]]\r
-<em>git-branch</em> [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]\r
+<em>git-branch</em> [--track | --no-track] [-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) [-r] &lt;branchname&gt;&#8230;</div></div>\r
 </div>\r
@@ -289,6 +289,12 @@ and option <tt>-a</tt> shows both.</p>
 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
 equal to that of the currently checked out branch.</p>\r
+<p>When a local branch is started off a remote branch, git can setup the\r
+branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that\r
+remote branch.  If this behavior is desired, it is possible to make it\r
+the default using the global <tt>branch.autosetupmerge</tt> configuration\r
+flag.  Otherwise, it can be chosen per-branch using the <tt>--track</tt>\r
+and <tt>--no-track</tt> options.</p>\r
 <p>With a <em>-m</em> or <em>-M</em> option, &lt;oldbranch&gt; will be renamed to &lt;newbranch&gt;.\r
 If &lt;oldbranch&gt; had a corresponding reflog, it is renamed to match\r
 &lt;newbranch&gt;, and a reflog entry is created to remember the branch\r
@@ -520,7 +526,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 03-Mar-2007 05:18:14 UTC\r
+Last updated 14-Mar-2007 11:19:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index 3ea3b8063520fe2a6f97b767d5f2e2ac05d147d9..603f87f3b59358697da821ffe240be9caff43fa7 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git-branch' [--color | --no-color] [-r | -a]
           [-v [--abbrev=<length> | --no-abbrev]]
-'git-branch' [-l] [-f] <branchname> [<start-point>]
+'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
 'git-branch' (-m | -M) [<oldbranch>] <newbranch>
 'git-branch' (-d | -D) [-r] <branchname>...
 
@@ -26,6 +26,13 @@ It will start out with a head equal to the one given as <start-point>.
 If no <start-point> is given, the branch will be created with a head
 equal to that of the currently checked out branch.
 
+When a local branch is started off a remote branch, git can setup the
+branch so that gitlink:git-pull[1] will appropriately merge from that
+remote branch.  If this behavior is desired, it is possible to make it
+the default using the global `branch.autosetupmerge` configuration
+flag.  Otherwise, it can be chosen per-branch using the `--track`
+and `--no-track` options.
+
 With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
 If <oldbranch> had a corresponding reflog, it is renamed to match
 <newbranch>, and a reflog entry is created to remember the branch

diff --git a/git-checkout.html b/git-checkout.html
index 843465cba7f0fbd4e4e84fefd7b7901a4cc533a3..05a675a5138be7e1f6ebb0c4ffb5268b8c7efe67 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -273,7 +273,7 @@ git-checkout(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-checkout</em> [-q] [-f] [-b &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]\r
+<div class="content"><em>git-checkout</em> [-q] [-f] [-b [--track | --no-track] &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]\r
 <em>git-checkout</em> [&lt;tree-ish&gt;] &lt;paths&gt;&#8230;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -282,7 +282,8 @@ git-checkout(1) Manual Page
 updating the index and working tree to reflect the specified\r
 branch, &lt;branch&gt;, and updating HEAD to be &lt;branch&gt; or, if\r
 specified, &lt;new_branch&gt;.  Using -b will cause &lt;new_branch&gt; to\r
-be created.</p>\r
+be created; in this case you can use the --track or --no-track\r
+options, which will be passed to <tt>git branch</tt>.</p>\r
 <p>When &lt;paths&gt; are given, this command does <strong>not</strong> switch\r
 branches.  It updates the named paths in the working tree from\r
 the index file (i.e. it runs <tt>git-checkout-index -f -u</tt>), or a\r
@@ -324,6 +325,26 @@ working tree.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--track\r
+</dt>\r
+<dd>\r
+<p>\r
+        When -b is given and a branch is created off a remote branch,\r
+        setup so that git-pull will automatically retrieve data from\r
+        the remote branch.\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-track\r
+</dt>\r
+<dd>\r
+<p>\r
+        When -b is given and a branch is created off a remote branch,\r
+        force that git-pull will automatically retrieve data from\r
+        the remote branch independent of the configuration settings.\r
+</p>\r
+</dd>\r
+<dt>\r
 -l\r
 </dt>\r
 <dd>\r
@@ -511,7 +532,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Feb-2007 00:34:40 UTC\r
+Last updated 14-Mar-2007 11:19:09 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.txt b/git-checkout.txt
index 1ae77be45055418b9c784d15db520841dd7bdd7a..f5b2d5017b5710a08c89a7cb150d8ef45527bf99 100644 (file)
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch
 SYNOPSIS
 --------
 [verse]
-'git-checkout' [-q] [-f] [-b <new_branch> [-l]] [-m] [<branch>]
+'git-checkout' [-q] [-f] [-b [--track | --no-track] <new_branch> [-l]] [-m] [<branch>]
 'git-checkout' [<tree-ish>] <paths>...
 
 DESCRIPTION
@@ -18,7 +18,8 @@ When <paths> are not given, this command switches branches by
 updating the index and working tree to reflect the specified
 branch, <branch>, and updating HEAD to be <branch> or, if
 specified, <new_branch>.  Using -b will cause <new_branch> to
-be created.
+be created; in this case you can use the --track or --no-track
+options, which will be passed to `git branch`.
 
 When <paths> are given, this command does *not* switch
 branches.  It updates the named paths in the working tree from
@@ -45,6 +46,16 @@ OPTIONS
        by gitlink:git-check-ref-format[1].  Some of these checks
        may restrict the characters allowed in a branch name.
 
+--track::
+       When -b is given and a branch is created off a remote branch,
+       setup so that git-pull will automatically retrieve data from
+       the remote branch.
+
+--no-track::
+       When -b is given and a branch is created off a remote branch,
+       force that git-pull will automatically retrieve data from
+       the remote branch independent of the configuration settings.
+
 -l::
        Create the new branch's ref log.  This activates recording of
        all changes to made the branch ref, enabling use of date

diff --git a/git-config.html b/git-config.html
index 78161b6d32ab7fd9442fe93af63fb7fd281d12c8..0bf7285acf1ee0d99e6fff455ab1689e7576d80a 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1257,6 +1257,16 @@ merge.summary
 </p>\r
 </dd>\r
 <dt>\r
+merge.tool\r
+</dt>\r
+<dd>\r
+<p>\r
+        Controls which merge resolution program is used by\r
+        <a href="git-mergetool.html">git-mergetool(l)</a>.  Valid values are: "kdiff3", "tkdiff",\r
+        "meld", "xxdiff", "emerge"\r
+</p>\r
+</dd>\r
+<dt>\r
 merge.verbosity\r
 </dt>\r
 <dd>\r
@@ -1509,7 +1519,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 09-Mar-2007 09:06:21 UTC\r
+Last updated 14-Mar-2007 11:19:10 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsserver.html b/git-cvsserver.html
index ad90a7c749acf8f5fb91c71c8f4c68f174b83d07..8059ac81d2d8d8cbb46c3b203ba99d83b9b30f13 100644 (file)
--- a/git-cvsserver.html
+++ b/git-cvsserver.html
@@ -406,10 +406,28 @@ so that calling <em>cvs</em> effectively calls git-cvsserver.</p>
 </div>\r
 <h2>Clients known to work</h2>\r
 <div class="sectionbody">\r
-<p>CVS 1.12.9 on Debian\r
+<ul>\r
+<li>\r
+<p>\r
+CVS 1.12.9 on Debian\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 CVS 1.11.17 on MacOSX (from Fink package)\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)\r
-TortoiseCVS</p>\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+TortoiseCVS\r
+</p>\r
+</li>\r
+</ul>\r
 </div>\r
 <h2>Operations supported</h2>\r
 <div class="sectionbody">\r
@@ -428,13 +446,24 @@ No keyword expansion or newline munging is supported.</p>
 <h2>Copyright and Authors</h2>\r
 <div class="sectionbody">\r
 <p>This program is copyright The Open University UK - 2006.</p>\r
-<p>Authors: Martyn Smith    &lt;martyn@catalyst.net.nz&gt;\r
-         Martin Langhoff &lt;martin@catalyst.net.nz&gt;\r
-         with ideas and patches from participants of the git-list &lt;git@vger.kernel.org&gt;.</p>\r
+<p>Authors:</p>\r
+<ul>\r
+<li>\r
+<p>\r
+Martyn Smith    &lt;martyn@catalyst.net.nz&gt;\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Martin Langhoff &lt;martin@catalyst.net.nz&gt;\r
+</p>\r
+</li>\r
+</ul>\r
+<p>with ideas and patches from participants of the git-list &lt;git@vger.kernel.org&gt;.</p>\r
 </div>\r
 <h2>Documentation</h2>\r
 <div class="sectionbody">\r
-<p>Documentation by Martyn Smith &lt;martyn@catalyst.net.nz&gt; and Martin Langhoff &lt;martin@catalyst.net.nz&gt; Matthias Urlichs &lt;smurf@smurf.noris.de&gt;.</p>\r
+<p>Documentation by Martyn Smith &lt;martyn@catalyst.net.nz&gt;, Martin Langhoff &lt;martin@catalyst.net.nz&gt;, and Matthias Urlichs &lt;smurf@smurf.noris.de&gt;.</p>\r
 </div>\r
 <h2>GIT</h2>\r
 <div class="sectionbody">\r
@@ -442,7 +471,7 @@ No keyword expansion or newline munging is supported.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:40:59 UTC\r
+Last updated 14-Mar-2007 11:19:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsserver.txt b/git-cvsserver.txt
index e328db3797888046802b82954d8946bc8d317075..1c6f6a7e27d74422085ce32cea1b74c822d1a4b2 100644 (file)
--- a/git-cvsserver.txt
+++ b/git-cvsserver.txt
@@ -121,10 +121,10 @@ so that calling 'cvs' effectively calls git-cvsserver.
 Clients known to work
 ---------------------
 
-CVS 1.12.9 on Debian
-CVS 1.11.17 on MacOSX (from Fink package)
-Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)
-TortoiseCVS
+- CVS 1.12.9 on Debian
+- CVS 1.11.17 on MacOSX (from Fink package)
+- Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)
+- TortoiseCVS
 
 Operations supported
 --------------------
@@ -148,13 +148,16 @@ Copyright and Authors
 
 This program is copyright The Open University UK - 2006.
 
-Authors: Martyn Smith    <martyn@catalyst.net.nz>
-         Martin Langhoff <martin@catalyst.net.nz>
-         with ideas and patches from participants of the git-list <git@vger.kernel.org>.
+Authors:
+
+- Martyn Smith    <martyn@catalyst.net.nz>
+- Martin Langhoff <martin@catalyst.net.nz>
+
+with ideas and patches from participants of the git-list <git@vger.kernel.org>.
 
 Documentation
 --------------
-Documentation by Martyn Smith <martyn@catalyst.net.nz> and Martin Langhoff <martin@catalyst.net.nz> Matthias Urlichs <smurf@smurf.noris.de>.
+Documentation by Martyn Smith <martyn@catalyst.net.nz>, Martin Langhoff <martin@catalyst.net.nz>, and Matthias Urlichs <smurf@smurf.noris.de>.
 
 GIT
 ---

diff --git a/git-mergetool.html b/git-mergetool.html
new file mode 100644 (file)
index 0000000..a277397
--- /dev/null
+++ b/git-mergetool.html
@@ -0,0 +1,326 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+  border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+  margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+  font-style: italic;\r
+}\r
+\r
+strong {\r
+  font-weight: bold;\r
+}\r
+\r
+tt {\r
+  color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  margin-top: 1.2em;\r
+  margin-bottom: 0.5em;\r
+  line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+  border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+  border-bottom: 2px solid silver;\r
+  padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+  font-family: serif;\r
+  margin-left: 0;\r
+}\r
+\r
+hr {\r
+  border: 1px solid silver;\r
+}\r
+\r
+p {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+  padding: 0;\r
+  margin: 0;\r
+}\r
+\r
+span#author {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+  font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+  font-family: sans-serif;\r
+  font-size: small;\r
+  border-top: 2px solid silver;\r
+  padding-top: 0.5em;\r
+  margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+  float: left;\r
+  padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+  float: right;\r
+  padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+  margin-right: 10%;\r
+  margin-top: 1.5em;\r
+  margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+  margin-top: 2.5em;\r
+  margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+  padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  text-align: left;\r
+  margin-top: 1.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+  margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+  margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+  padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+  text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+  vertical-align: top;\r
+  font-size: 1.1em;\r
+  font-weight: bold;\r
+  text-decoration: underline;\r
+  color: #527bbd;\r
+  padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+  padding-left: 0.5em;\r
+  border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+  border-left: 2px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+  white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+dt {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0;\r
+  font-style: italic;\r
+}\r
+dd > *:first-child {\r
+  margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+    list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+  list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+  border-color: #527bbd;\r
+  border-width: 3px;\r
+}\r
+thead {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+}\r
+tfoot {\r
+  font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+  vertical-align: top;\r
+  font-style: italic;\r
+  padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+  vertical-align: top;\r
+}\r
+\r
+@media print {\r
+  div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  margin-top: 0.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+  padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+  border-left: 2px solid silver;\r
+  padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-mergetool(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-mergetool(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-mergetool -\r
+   Run merge conflict resolution tools to resolve merge conflicts\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p><em>git-mergetool</em> [--tool=&lt;tool&gt;] [&lt;file&gt;]&#8230;</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>Use <em>git mergetool</em> to run one of several merge utilities to resolve\r
+merge conflicts.  It is typically run after <a href="git-merge.html">git-merge(1)</a>.</p>\r
+<p>If one or more &lt;file&gt; parameters are given, the merge tool program will\r
+be run to resolve differences on each file.  If no &lt;file&gt; names are\r
+specified, <em>git mergetool</em> will run the merge tool program on every file\r
+with merge conflicts.</p>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+-t or --tool=&lt;tool&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Use the merge resolution program specified by &lt;tool&gt;.\r
+        Valid merge tools are:\r
+        kdiff3, tkdiff, meld, xxdiff, and emerge.\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>If a merge resolution program is not specified, 'git mergetool'\r
+will use the configuration variable merge.tool.  If the\r
+configuration variable merge.tool is not set, 'git mergetool'\r
+will pick a suitable default.</tt></pre>\r
+</div></div>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Theodore Y Ts'o &lt;tytso@mit.edu&gt;</p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by Theodore Y Ts'o.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 14-Mar-2007 11:19:12 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r

diff --git a/git-mergetool.txt b/git-mergetool.txt
new file mode 100644 (file)
index 0000000..ae69a0e
--- /dev/null
+++ b/git-mergetool.txt
@@ -0,0 +1,46 @@
+git-mergetool(1)
+================
+
+NAME
+----
+git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
+
+SYNOPSIS
+--------
+'git-mergetool' [--tool=<tool>] [<file>]...
+
+DESCRIPTION
+-----------
+
+Use 'git mergetool' to run one of several merge utilities to resolve
+merge conflicts.  It is typically run after gitlink:git-merge[1].
+
+If one or more <file> parameters are given, the merge tool program will
+be run to resolve differences on each file.  If no <file> names are
+specified, 'git mergetool' will run the merge tool program on every file
+with merge conflicts.
+
+OPTIONS
+-------
+-t or --tool=<tool>::
+       Use the merge resolution program specified by <tool>.
+       Valid merge tools are:
+       kdiff3, tkdiff, meld, xxdiff, and emerge.
+
+       If a merge resolution program is not specified, 'git mergetool'
+       will use the configuration variable merge.tool.  If the
+       configuration variable merge.tool is not set, 'git mergetool'
+       will pick a suitable default.
+
+Author
+------
+Written by Theodore Y Ts'o <tytso@mit.edu>
+
+Documentation
+--------------
+Documentation by Theodore Y Ts'o.
+
+GIT
+---
+Part of the gitlink:git[7] suite
+

diff --git a/git-svn.html b/git-svn.html
index ba80e48ad884701546ad93ee5cdbd0d880c1041f..b3f30295e254def2fbb981914d2ef11a0f55a822 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -431,7 +431,25 @@ accepts.  However <em>--fetch-all</em> only fetches from the current
 [svn-remote], and not all [svn-remote] definitions.</p>\r
 <p>Like <em>git-rebase</em>; this requires that the working tree be clean\r
 and have no uncommitted changes.</p>\r
+<p>+</p>\r
 </dd>\r
+</dl>\r
+<dl>\r
+<dt>\r
+-l\r
+</dt>\r
+<dt>\r
+--local\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do not fetch remotely; only run <em>git-rebase</em> against the\r
+        last fetched commit from the upstream SVN.\r
+</p>\r
+</dd>\r
+</dl>\r
+<p>+</p>\r
+<dl>\r
 <dt>\r
 <em>dcommit</em>\r
 </dt>\r
@@ -966,7 +984,7 @@ should be manually entered with a text-editor or using
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Mar-2007 10:34:23 UTC\r
+Last updated 14-Mar-2007 11:19:13 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.txt b/git-svn.txt
index 9b5a3d61966eaa8d24b5ee507f2e1be770a1c367..a0d34e0058d721e655fd23c36415aaaecfa0c666 100644 (file)
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -104,6 +104,14 @@ accepts.  However '--fetch-all' only fetches from the current
 
 Like 'git-rebase'; this requires that the working tree be clean
 and have no uncommitted changes.
++
+--
+-l;;
+--local;;
+       Do not fetch remotely; only run 'git-rebase' against the
+       last fetched commit from the upstream SVN.
+--
++
 
 'dcommit'::
        Commit each diff from a specified head directly to the SVN

diff --git a/git.html b/git.html
index 12b59118e6887af903a94f1948e2ad743f11c590..cfca0b91cb43b16678bdc0721fc3581f7c4d503a 100644 (file)
--- a/git.html
+++ b/git.html
@@ -657,6 +657,14 @@ ancillary user utilities.</p>
 </p>\r
 </dd>\r
 <dt>\r
+<a href="git-mergetool.html">git-mergetool(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+        Run merge conflict resolution tools to resolve merge conflicts.\r
+</p>\r
+</dd>\r
+<dt>\r
 <a href="git-pack-refs.html">git-pack-refs(1)</a>\r
 </dt>\r
 <dd>\r
@@ -2309,7 +2317,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 12-Mar-2007 07:28:56 UTC\r
+Last updated 14-Mar-2007 11:19:14 UTC\r
 </div>\r
 </div>\r
 </body>\r