Autogenerated HTML docs for v1.8.2-rc0

gitster · Feb 18, 2013 · 80ad00d · 80ad00d
1 parent 0292db3
commit 80ad00d
Show file tree

Hide file tree

Showing 11 changed files with 458 additions and 0 deletions.
diff --git a/RelNotes/1.8.2.txt b/RelNotes/1.8.2.txt
@@ -95,6 +95,10 @@ UI, Workflows & Features
  * "git commit" can be told to use --cleanup=whitespace by setting the
    configuration variable commit.cleanup to 'whitespace'.
 
+ * "git diff" and other Porcelain commands can be told to use a
+   non-standard algorithm by setting diff.algorithm configuration
+   variable.
+
  * "git fetch --mirror" and fetch that uses other forms of refspec
    with wildcard used to attempt to update a symbolic ref that match
    the wildcard on the receiving end, which made little sense (the
@@ -118,6 +122,10 @@ UI, Workflows & Features
  * "git log --cc --graph" now shows the combined diff output with the
    ancestry graph.
 
+ * "git log --grep=<pattern>" honors i18n.logoutputencoding to look
+   for the pattern after fixing the log message to the specified
+   encoding.
+
  * "git mergetool" and "git difftool" learned to list the available
    tool backends in a more consistent manner.
 
@@ -154,6 +162,11 @@ UI, Workflows & Features
    tip of the remote branch (as opposed to integrating with the commit
    recorded in the superproject's gitlink).
 
+ * "git upload-pack" which implements the service "ls-remote" and
+   "fetch" talk to can be told to hide ref hierarchies the server
+   side internally uses (and that clients have no business learning
+   about) with transfer.hiderefs configuration.
+
 
 Foreign Interface
 

diff --git a/config.txt b/config.txt
@@ -1880,6 +1880,15 @@ receive.denyNonFastForwards::
 	even if that push is forced. This configuration variable is
 	set when initializing a shared repository.
 
+receive.hiderefs::
+	String(s) `receive-pack` uses to decide which refs to omit
+	from its initial advertisement.  Use more than one
+	definitions to specify multiple prefix strings. A ref that
+	are under the hierarchies listed on the value of this
+	variable is excluded, and is hidden when responding to `git
+	push`, and an attempt to update or delete a hidden ref by
+	`git push` is rejected.
+
 receive.updateserverinfo::
 	If set to true, git-receive-pack will run git-update-server-info
 	after receiving data from git-push and updating refs.
@@ -2092,11 +2101,25 @@ transfer.fsckObjects::
 	not set, the value of this variable is used instead.
 	Defaults to false.
 
+transfer.hiderefs::
+	This variable can be used to set both `receive.hiderefs`
+	and `uploadpack.hiderefs` at the same time to the same
+	values.  See entries for these other variables.
+
 transfer.unpackLimit::
 	When `fetch.unpackLimit` or `receive.unpackLimit` are
 	not set, the value of this variable is used instead.
 	The default value is 100.
 
+uploadpack.hiderefs::
+	String(s) `upload-pack` uses to decide which refs to omit
+	from its initial advertisement.  Use more than one
+	definitions to specify multiple prefix strings. A ref that
+	are under the hierarchies listed on the value of this
+	variable is excluded, and is hidden from `git ls-remote`,
+	`git fetch`, etc.  An attempt to fetch a hidden ref by `git
+	fetch` will fail.
+
 url.<base>.insteadOf::
 	Any URL that starts with this value will be rewritten to
 	start, instead, with <base>. In cases where some site serves a

diff --git a/diff-config.txt b/diff-config.txt
@@ -156,3 +156,20 @@ diff.tool::
 	that a corresponding difftool.<tool>.cmd variable is defined.
 
 include::mergetools-diff.txt[]
+
+diff.algorithm::
+	Choose a diff algorithm.  The variants are as follows:
++
+--
+`default`, `myers`;;
+	The basic greedy diff algorithm. Currently, this is the default.
+`minimal`;;
+	Spend extra time to make sure the smallest possible diff is
+	produced.
+`patience`;;
+	Use "patience diff" algorithm when generating patches.
+`histogram`;;
+	This algorithm extends the patience algorithm to "support
+	low-occurrence common elements".
+--
++
diff --git a/diff-options.txt b/diff-options.txt
@@ -55,6 +55,26 @@ endif::git-format-patch[]
 --histogram::
 	Generate a diff using the "histogram diff" algorithm.
 
+--diff-algorithm={patience|minimal|histogram|myers}::
+	Choose a diff algorithm. The variants are as follows:
++
+--
+`default`, `myers`;;
+	The basic greedy diff algorithm. Currently, this is the default.
+`minimal`;;
+	Spend extra time to make sure the smallest possible diff is
+	produced.
+`patience`;;
+	Use "patience diff" algorithm when generating patches.
+`histogram`;;
+	This algorithm extends the patience algorithm to "support
+	low-occurrence common elements".
+--
++
+For instance, if you configured diff.algorithm variable to a
+non-default value and want to use the default one, then you
+have to use `--diff-algorithm=default` option.
+
 --stat[=<width>[,<name-width>[,<count>]]]::
 	Generate a diffstat. By default, as much space as necessary
 	will be used for the filename part, and the rest for the graph

diff --git a/git-config.html b/git-config.html
@@ -3243,6 +3243,53 @@ <h3 id="_variables">Variables</h3>
 </ul></div>
 </dd>
 <dt class="hdlist1">
+diff.algorithm
+</dt>
+<dd>
+<p>
+        Choose a diff algorithm.  The variants are as follows:
+</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>default</code>, <code>myers</code>
+</dt>
+<dd>
+<p>
+        The basic greedy diff algorithm. Currently, this is the default.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>minimal</code>
+</dt>
+<dd>
+<p>
+        Spend extra time to make sure the smallest possible diff is
+        produced.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>patience</code>
+</dt>
+<dd>
+<p>
+        Use "patience diff" algorithm when generating patches.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>histogram</code>
+</dt>
+<dd>
+<p>
+        This algorithm extends the patience algorithm to "support
+        low-occurrence common elements".
+</p>
+</dd>
+</dl></div>
+</div></div>
+</dd>
+<dt class="hdlist1">
 difftool.&lt;tool&gt;.path
 </dt>
 <dd>
@@ -5081,6 +5128,20 @@ <h3 id="_variables">Variables</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+receive.hiderefs
+</dt>
+<dd>
+<p>
+        String(s) <code>receive-pack</code> uses to decide which refs to omit
+        from its initial advertisement.  Use more than one
+        definitions to specify multiple prefix strings. A ref that
+        are under the hierarchies listed on the value of this
+        variable is excluded, and is hidden when responding to <code>git
+        push</code>, and an attempt to update or delete a hidden ref by
+        <code>git push</code> is rejected.
+</p>
+</dd>
+<dt class="hdlist1">
 receive.updateserverinfo
 </dt>
 <dd>
@@ -5517,6 +5578,16 @@ <h3 id="_variables">Variables</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+transfer.hiderefs
+</dt>
+<dd>
+<p>
+        This variable can be used to set both <code>receive.hiderefs</code>
+        and <code>uploadpack.hiderefs</code> at the same time to the same
+        values.  See entries for these other variables.
+</p>
+</dd>
+<dt class="hdlist1">
 transfer.unpackLimit
 </dt>
 <dd>
@@ -5527,6 +5598,20 @@ <h3 id="_variables">Variables</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+uploadpack.hiderefs
+</dt>
+<dd>
+<p>
+        String(s) <code>upload-pack</code> uses to decide which refs to omit
+        from its initial advertisement.  Use more than one
+        definitions to specify multiple prefix strings. A ref that
+        are under the hierarchies listed on the value of this
+        variable is excluded, and is hidden from <code>git ls-remote</code>,
+        <code>git fetch</code>, etc.  An attempt to fetch a hidden ref by <code>git
+        fetch</code> will fail.
+</p>
+</dd>
+<dt class="hdlist1">
 url.&lt;base&gt;.insteadOf
 </dt>
 <dd>

diff --git a/git-diff-files.html b/git-diff-files.html
@@ -835,6 +835,56 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+--diff-algorithm={patience|minimal|histogram|myers}
+</dt>
+<dd>
+<p>
+        Choose a diff algorithm. The variants are as follows:
+</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>default</code>, <code>myers</code>
+</dt>
+<dd>
+<p>
+        The basic greedy diff algorithm. Currently, this is the default.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>minimal</code>
+</dt>
+<dd>
+<p>
+        Spend extra time to make sure the smallest possible diff is
+        produced.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>patience</code>
+</dt>
+<dd>
+<p>
+        Use "patience diff" algorithm when generating patches.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>histogram</code>
+</dt>
+<dd>
+<p>
+        This algorithm extends the patience algorithm to "support
+        low-occurrence common elements".
+</p>
+</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a
+non-default value and want to use the default one, then you
+have to use <code>--diff-algorithm=default</code> option.</p></div>
+</dd>
+<dt class="hdlist1">
 --stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
 </dt>
 <dd>

diff --git a/git-diff-index.html b/git-diff-index.html
@@ -836,6 +836,56 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+--diff-algorithm={patience|minimal|histogram|myers}
+</dt>
+<dd>
+<p>
+        Choose a diff algorithm. The variants are as follows:
+</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+<code>default</code>, <code>myers</code>
+</dt>
+<dd>
+<p>
+        The basic greedy diff algorithm. Currently, this is the default.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>minimal</code>
+</dt>
+<dd>
+<p>
+        Spend extra time to make sure the smallest possible diff is
+        produced.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>patience</code>
+</dt>
+<dd>
+<p>
+        Use "patience diff" algorithm when generating patches.
+</p>
+</dd>
+<dt class="hdlist1">
+<code>histogram</code>
+</dt>
+<dd>
+<p>
+        This algorithm extends the patience algorithm to "support
+        low-occurrence common elements".
+</p>
+</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a
+non-default value and want to use the default one, then you
+have to use <code>--diff-algorithm=default</code> option.</p></div>
+</dd>
+<dt class="hdlist1">
 --stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
 </dt>
 <dd>