Autogenerated HTML docs for v1.8.5-rc0

RelNotes/1.8.5.txt

@@ -244,6 +244,29 @@ Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
 track are contained in this release (see release notes to them for
 details).
 
+ * Coloring around octopus merges in "log --graph" output was screwy.
+   (merge 339c17b hn/log-graph-color-octopus later to maint).
+
+ * "git checkout topic", when there is not yet a local "topic" branch
+   but there is a unique remote-tracking branch for a remote "topic"
+   branch, pretended as if "git checkout -t -b topic remote/$r/topic"
+   (for that unique remote $r) was run. This hack however was not
+   implemented for "git checkout topic --".
+   (merge bca3969 mm/checkout-auto-track-fix later to maint).
+
+ * One long-standing flaw in the pack transfer protocol used by "git
+   clone" was that there was no way to tell the other end which branch
+   "HEAD" points at, and the receiving end needed to guess.  A new
+   capability has been defined in the pack protocol to convey this
+   information so that cloning from a repository with more than one
+   branches pointing at the same commit where the HEAD is at now
+   reliably sets the initial branch in the resulting repository.
+   (merge 360a326 jc/upload-pack-send-symref later to maint).
+
+ * We did not handle cases where http transport gets redirected during
+   the authorization request (e.g. from http:// to https://).
+   (merge 70900ed jk/http-auth-redirects later to maint).
+
  * Bash prompting code to deal with an SVN remote as an upstream
    were coded in a way not supported by older Bash versions (3.x).
    (merge 52ec889 sg/prompt-svn-remote-fix later to maint).

git-svn.html

@@ -1043,11 +1043,11 @@ <h2 id="_commands">COMMANDS</h2>
 </dt>
 <dd>
 <p>
-    Fetch &lt;n&gt; log entries per request when scanning Subversion history.
-    The default is 100. For very large Subversion repositories, larger
-    values may be needed for <em>clone</em>/<em>fetch</em> to complete in reasonable
-    time. But overly large values may lead to higher memory usage and
-    request timeouts.
+        Fetch &lt;n&gt; log entries per request when scanning Subversion history.
+        The default is 100. For very large Subversion repositories, larger
+        values may be needed for <em>clone</em>/<em>fetch</em> to complete in reasonable
+        time. But overly large values may lead to higher memory usage and
+        request timeouts.
 </p>
 </dd>
 </dl></div>
@@ -1196,7 +1196,7 @@ <h2 id="_commands">COMMANDS</h2>
         For each patch, one may answer "yes" (accept this patch), "no" (discard this
         patch), "all" (accept all patches), or "quit".
        <br />
-       <em>git svn dcommit</em> returns immediately if answer is "no" or "quit", without
+        <em>git svn dcommit</em> returns immediately if answer is "no" or "quit", without
         committing anything to SVN.
 </p>
 </dd>
@@ -1395,12 +1395,12 @@ <h2 id="_commands">COMMANDS</h2>
 </dt>
 <dd>
 <p>
-       Show what revision and author last modified each line of a file. The
-       output of this mode is format-compatible with the output of
-       &#8216;svn blame&#8217; by default. Like the SVN blame command,
-       local uncommitted changes in the working tree are ignored;
-       the version of the file in the HEAD revision is annotated. Unknown
-       arguments are passed directly to <em>git blame</em>.
+        Show what revision and author last modified each line of a file. The
+        output of this mode is format-compatible with the output of
+        &#8216;svn blame&#8217; by default. Like the SVN blame command,
+        local uncommitted changes in the working tree are ignored;
+        the version of the file in the HEAD revision is annotated. Unknown
+        arguments are passed directly to <em>git blame</em>.
 </p>
 <div class="dlist"><dl>
 <dt class="hdlist1">
@@ -2128,7 +2128,7 @@ <h2 id="_basic_examples">BASIC EXAMPLES</h2>
 # View all branches and tags you have cloned:
         git branch -r
 # Create a new branch in SVN
-    git svn branch waldo
+        git svn branch waldo
 # Reset your master to trunk (or any other branch, replacing 'trunk'
 # with the appropriate name):
         git reset --hard svn/trunk
@@ -2422,7 +2422,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-10-16 14:11:04 PDT
+Last updated 2013-10-30 14:54:47 PDT
 </div>
 </div>
 </body>

git-svn.txt

@@ -175,11 +175,11 @@ Skip "branches" and "tags" of first level directories;;
 	precedence over '--include-paths'.
 
 --log-window-size=<n>;;
-    Fetch <n> log entries per request when scanning Subversion history.
-    The default is 100. For very large Subversion repositories, larger
-    values may be needed for 'clone'/'fetch' to complete in reasonable
-    time. But overly large values may lead to higher memory usage and
-    request timeouts.
+	Fetch <n> log entries per request when scanning Subversion history.
+	The default is 100. For very large Subversion repositories, larger
+	values may be needed for 'clone'/'fetch' to complete in reasonable
+	time. But overly large values may lead to higher memory usage and
+	request timeouts.
 
 'clone'::
 	Runs 'init' and 'fetch'.  It will automatically create a
@@ -275,7 +275,7 @@ first have already been pushed into SVN.
 	For each patch, one may answer "yes" (accept this patch), "no" (discard this
 	patch), "all" (accept all patches), or "quit".
 	+
-       'git svn dcommit' returns immediately if answer is "no" or "quit", without
+	'git svn dcommit' returns immediately if answer is "no" or "quit", without
 	committing anything to SVN.
 
 'branch'::
@@ -366,12 +366,12 @@ 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. 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 tree are ignored;
-       the version of the file in the HEAD revision is annotated. Unknown
-       arguments are passed directly to 'git blame'.
+	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 tree are ignored;
+	the version of the file in the HEAD revision is annotated. Unknown
+	arguments are passed directly to 'git blame'.
 +
 --git-format;;
 	Produce output in the same format as 'git blame', but with
@@ -830,7 +830,7 @@ Tracking and contributing to an entire Subversion-managed project
 # View all branches and tags you have cloned:
 	git branch -r
 # Create a new branch in SVN
-    git svn branch waldo
+	git svn branch waldo
 # Reset your master to trunk (or any other branch, replacing 'trunk'
 # with the appropriate name):
 	git reset --hard svn/trunk

gitk.html

@@ -746,7 +746,7 @@ <h2>NAME</h2>
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>gitk</em> [&lt;option&gt;&#8230;] [&lt;revs&gt;] [--] [&lt;path&gt;&#8230;]</pre>
+<pre class="content"><em>gitk</em> [&lt;options&gt;] [&lt;revision range&gt;] [--] [&lt;path&gt;&#8230;]</pre>
 <div class="attribution">
 </div></div>
 </div>
@@ -757,28 +757,48 @@ <h2 id="_description">DESCRIPTION</h2>
 <div class="paragraph"><p>Displays changes in a repository or a selected set of commits. This includes
 visualizing the commit graph, showing information related to each commit, and
 the files in the trees of each revision.</p></div>
-<div class="paragraph"><p>Historically, gitk was the first repository browser. It&#8217;s written in tcl/tk
-and started off in a separate repository but was later merged into the main
-Git repository.</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>To control which revisions to show, the command takes options applicable to
-the <em>git rev-list</em> command (see <a href="git-rev-list.html">git-rev-list(1)</a>).
-This manual page describes only the most
-frequently used options.</p></div>
+<div class="paragraph"><p>To control which revisions to show, gitk supports most options
+applicable to the <em>git rev-list</em> command.  It also supports a few
+options applicable to the <em>git diff-*</em> commands to control how the
+changes each commit introduces are shown.  Finally, it supports some
+gitk-specific options.</p></div>
+<div class="paragraph"><p>gitk generally only understands options with arguments in the
+<em>sticked</em> form (see <a href="gitcli.html">gitcli(7)</a>) due to limitations in the
+command line parser.</p></div>
+<div class="sect2">
+<h3 id="_rev_list_options_and_arguments">rev-list options and arguments</h3>
+<div class="paragraph"><p>This manual page describes only the most frequently used options.  See
+<a href="git-rev-list.html">git-rev-list(1)</a> for a complete list.</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
--n &lt;number&gt;
+--all
+</dt>
+<dd>
+<p>
+        Show all refs (branches, tags, etc.).
+</p>
+</dd>
+<dt class="hdlist1">
+--branches[=&lt;pattern&gt;]
+</dt>
+<dt class="hdlist1">
+--tags[=&lt;pattern&gt;]
 </dt>
 <dt class="hdlist1">
---max-count=&lt;number&gt;
+--remotes[=&lt;pattern&gt;]
 </dt>
 <dd>
 <p>
-        Limits the number of commits to show.
+        Pretend as if all the branches (tags, remote branches, resp.)
+        are listed on the command line as <em>&lt;commit&gt;</em>. If <em>&lt;pattern&gt;</em>
+        is given, limit refs to ones matching given shell glob. If
+        pattern lacks <em>?</em>, <em>&#42;</em>, or <em>[</em>, <em>/&#42;</em> at the
+        end is implied.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -798,11 +818,11 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
---all
+--date-order
 </dt>
 <dd>
 <p>
-        Show all branches.
+        Sort commits by date when possible.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -817,28 +837,53 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
---argscmd=&lt;command&gt;
+--left-right
 </dt>
 <dd>
 <p>
-        Command to be run each time gitk has to determine the list of
-        &lt;revs&gt; to show.  The command is expected to print on its standard
-        output a list of additional revs to be shown, one per line.
-        Use this instead of explicitly specifying &lt;revs&gt; if the set of
-        commits to show may vary between refreshes.
+        Mark which side of a symmetric diff a commit is reachable
+        from.  Commits from the left side are prefixed with a <code>&lt;</code>
+        symbol and those from the right with a <code>&gt;</code> symbol.
 </p>
 </dd>
 <dt class="hdlist1">
---select-commit=&lt;ref&gt;
+--full-history
 </dt>
 <dd>
 <p>
-        Automatically select the specified commit after loading the graph.
-        Default behavior is equivalent to specifying <em>--select-commit=HEAD</em>.
+        When filtering history with <em>&lt;path&gt;&#8230;</em>, does not prune some
+        history.  (See "History simplification" in <a href="git-log.html">git-log(1)</a>
+        for a more detailed explanation.)
+</p>
+</dd>
+<dt class="hdlist1">
+--simplify-merges
+</dt>
+<dd>
+<p>
+        Additional option to <em>--full-history</em> to remove some needless
+        merges from the resulting history, as there are no selected
+        commits contributing to this merge.  (See "History
+        simplification" in <a href="git-log.html">git-log(1)</a> for a more detailed
+        explanation.)
+</p>
+</dd>
+<dt class="hdlist1">
+--ancestry-path
+</dt>
+<dd>
+<p>
+        When given a range of commits to display
+        (e.g. <em>commit1..commit2</em> or <em>commit2 &#94;commit1</em>), only
+        display commits that exist directly on the ancestry chain
+        between the <em>commit1</em> and <em>commit2</em>, i.e. commits that are
+        both descendants of <em>commit1</em>, and ancestors of <em>commit2</em>.
+        (See "History simplification" in <a href="git-log.html">git-log(1)</a> for a more
+        detailed explanation.)
 </p>
 </dd>
 <dt class="hdlist1">
-&lt;revs&gt;
+&lt;revision range&gt;
 </dt>
 <dd>
 <p>
@@ -862,6 +907,34 @@ <h2 id="_options">OPTIONS</h2>
 </dd>
 </dl></div>
 </div>
+<div class="sect2">
+<h3 id="_gitk_specific_options">gitk-specific options</h3>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+--argscmd=&lt;command&gt;
+</dt>
+<dd>
+<p>
+        Command to be run each time gitk has to determine the revision
+        range to show.  The command is expected to print on its
+        standard output a list of additional revisions to be shown,
+        one per line.  Use this instead of explicitly specifying a
+        <em>&lt;revision range&gt;</em> if the set of commits to show may vary
+        between refreshes.
+</p>
+</dd>
+<dt class="hdlist1">
+--select-commit=&lt;ref&gt;
+</dt>
+<dd>
+<p>
+        Select the specified commit after loading the graph.
+        Default behavior is equivalent to specifying <em>--select-commit=HEAD</em>.
+</p>
+</dd>
+</dl></div>
+</div>
+</div>
 </div>
 <div class="sect1">
 <h2 id="_examples">Examples</h2>
@@ -906,6 +979,14 @@ <h2 id="_files">Files</h2>
 </div>
 </div>
 <div class="sect1">
+<h2 id="_history">History</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Gitk was the first graphical repository browser. It&#8217;s written in
+tcl/tk and started off in a separate repository but was later merged
+into the main Git repository.</p></div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
 <div class="dlist"><dl>
@@ -948,7 +1029,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-10-30 14:54:47 PDT
 </div>
 </div>
 </body>