Permalink
Browse files

Autogenerated HTML docs for v1.7.9.2-262-gba998

  • Loading branch information...
gitster committed Feb 23, 2012
1 parent 83002c9 commit e0238c23e1e315e119307c52ea25d665422b0082
View
@@ -8,9 +8,20 @@ UI, Workflows & Features
* Improved handling of views, labels and branches in git-p4 (in contrib).
+ * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
+ p4 expanded the embedded $RCS$-like keywords; it can be now told to
+ unexpand them.
+
+ * Some "git-svn" updates.
+
* "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
support incremental imports.
+ * The configuration mechanism learned an "include" facility; an
+ assignment to the include.path pseudo-variable causes the named
+ file to be included in-place when Git looks up configuration
+ variables.
+
* "git am" learned to pass "-b" option to underlying "git mailinfo", so
that bracketed string other than "PATCH" at the beginning can be kept.
@@ -60,6 +71,9 @@ Internal Implementation (please report possible regressions)
* The test suite supports the new "test_pause" helper function.
+ * Parallel to the test suite, there is a beginning of performance
+ benchmarking framework.
+
* t/Makefile is adjusted to prevent newer versions of GNU make from
running tests in seemingly random order.
@@ -73,13 +87,22 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
details).
+ * The config.mak.autogen generated by optional autoconf support tried
+ to link the binary with -lintl even when libintl.h is missing from
+ the system.
+ (merge a8356d4 js/configure-libintl later to maint).
+
+ * "git add --refresh <pathspec>" used to warn about unmerged paths
+ outside the given pathspec.
+ (merge 3d1f148 jc/add-refresh-unmerged later to maint).
+
* "gitweb" used to drop warnings in the log file when "heads" view is
accessed in a repository whose HEAD does not point at a valid
branch.
---
exec >/var/tmp/1
-O=v1.7.9.1-289-g5609586
+O=v1.7.9.2-261-gd065f68
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo
View
@@ -84,6 +84,17 @@ customary UNIX fashion.
Some variables may require a special value format.
+Includes
+~~~~~~~~
+
+You can include one config file from another by setting the special
+`include.path` variable to the name of the file to be included. The
+included file is expanded immediately, as if its contents had been
+found at the location of the include directive. If the value of the
+`include.path` variable is a relative path, the path is considered to be
+relative to the configuration file in which the include directive was
+found. See below for examples.
+
Example
~~~~~~~
@@ -106,6 +117,10 @@ Example
gitProxy="ssh" for "kernel.org"
gitProxy=default-proxy ; for the rest
+ [include]
+ path = /path/to/foo.inc ; include by absolute path
+ path = foo ; expand "foo" relative to the current file
+
Variables
~~~~~~~~~
View
@@ -889,6 +889,18 @@ <h2 id="_options">OPTIONS</h2>
<em>--system</em>, <em>--global</em>, or repository (default).
</p>
</dd>
+<dt class="hdlist1">
+--includes
+</dt>
+<dt class="hdlist1">
+--no-includes
+</dt>
+<dd>
+<p>
+ Respect <tt>include.*</tt> directives in config files when looking up
+ values. Defaults to on.
+</p>
+</dd>
</dl></div>
</div>
<h2 id="FILES">FILES</h2>
@@ -1125,6 +1137,14 @@ <h3 id="_syntax">Syntax</h3><div style="clear:left"></div>
<div class="paragraph"><p>Variable values ending in a <tt>\</tt> are continued on the next line in the
customary UNIX fashion.</p></div>
<div class="paragraph"><p>Some variables may require a special value format.</p></div>
+<h3 id="_includes">Includes</h3><div style="clear:left"></div>
+<div class="paragraph"><p>You can include one config file from another by setting the special
+<tt>include.path</tt> variable to the name of the file to be included. The
+included file is expanded immediately, as if its contents had been
+found at the location of the include directive. If the value of the
+<tt>include.path</tt> variable is a relative path, the path is considered to be
+relative to the configuration file in which the include directive was
+found. See below for examples.</p></div>
<h3 id="_example">Example</h3><div style="clear:left"></div>
<div class="literalblock">
<div class="content">
@@ -1153,6 +1173,12 @@ <h3 id="_example">Example</h3><div style="clear:left"></div>
gitProxy="ssh" for "kernel.org"
gitProxy=default-proxy ; for the rest</tt></pre>
</div></div>
+<div class="literalblock">
+<div class="content">
+<pre><tt>[include]
+ path = /path/to/foo.inc ; include by absolute path
+ path = foo ; expand "foo" relative to the current file</tt></pre>
+</div></div>
<h3 id="_variables">Variables</h3><div style="clear:left"></div>
<div class="paragraph"><p>Note that this list is non-comprehensive and not necessarily complete.
For command-specific variables, you will find a more detailed description
@@ -4826,7 +4852,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-02-23 14:45:28 PDT
</div>
</div>
</body>
View
@@ -178,6 +178,11 @@ See also <<FILES>>.
Opens an editor to modify the specified config file; either
'--system', '--global', or repository (default).
+--includes::
+--no-includes::
+ Respect `include.*` directives in config files when looking up
+ values. Defaults to on.
+
[[FILES]]
FILES
-----
View
@@ -662,6 +662,16 @@ <h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
+merge.branchdesc
+</dt>
+<dd>
+<p>
+ In addition to branch names, populate the log message with
+ the branch description text associated with them. Defaults
+ to false.
+</p>
+</dd>
+<dt class="hdlist1">
merge.log
</dt>
<dd>
@@ -695,7 +705,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-02-23 14:45:28 PDT
</div>
</div>
</body>
View
@@ -53,6 +53,11 @@ OPTIONS
CONFIGURATION
-------------
+merge.branchdesc::
+ In addition to branch names, populate the log message with
+ the branch description text associated with them. Defaults
+ to false.
+
merge.log::
In addition to branch names, populate the log message with at
most the specified number of one-line descriptions from the
View
@@ -1271,6 +1271,11 @@ <h3 id="_submit_variables">Submit variables</h3><div style="clear:left"></div>
</p>
</dd>
</dl></div>
+<div class="paragraph"><p>git-p4.attemptRCSCleanup:
+ If enabled, <em>git p4 submit</em> will attempt to cleanup RCS keywords
+ ($Header$, etc). These would otherwise cause merge conflicts and prevent
+ the submit going ahead. This option should be considered experimental at
+ present.</p></div>
</div>
<h2 id="_implementation_details">IMPLEMENTATION DETAILS</h2>
<div class="sectionbody">
@@ -1307,7 +1312,7 @@ <h2 id="_implementation_details">IMPLEMENTATION DETAILS</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-01-29 14:19:30 PDT
+Last updated 2012-02-23 14:45:28 PDT
</div>
</div>
</body>
View
@@ -483,6 +483,11 @@ git-p4.skipUserNameCheck::
user map, 'git p4' exits. This option can be used to force
submission regardless.
+git-p4.attemptRCSCleanup:
+ If enabled, 'git p4 submit' will attempt to cleanup RCS keywords
+ ($Header$, etc). These would otherwise cause merge conflicts and prevent
+ the submit going ahead. This option should be considered experimental at
+ present.
IMPLEMENTATION DETAILS
----------------------
View
@@ -588,7 +588,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<em>git remote rename</em> &lt;old&gt; &lt;new&gt;
<em>git remote rm</em> &lt;name&gt;
<em>git remote set-head</em> &lt;name&gt; (-a | -d | &lt;branch&gt;)
-<em>git remote set-branches</em> &lt;name&gt; [--add] &lt;branch&gt;&#8230;
+<em>git remote set-branches</em> [--add] &lt;name&gt; &lt;branch&gt;&#8230;
<em>git remote set-url</em> [--push] &lt;name&gt; &lt;newurl&gt; [&lt;oldurl&gt;]
<em>git remote set-url --add</em> [--push] &lt;name&gt; &lt;newurl&gt;
<em>git remote set-url --delete</em> [--push] &lt;name&gt; &lt;url&gt;
@@ -830,7 +830,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-02-23 14:45:28 PDT
</div>
</div>
</body>
View
@@ -14,7 +14,7 @@ SYNOPSIS
'git remote rename' <old> <new>
'git remote rm' <name>
'git remote set-head' <name> (-a | -d | <branch>)
-'git remote set-branches' <name> [--add] <branch>...
+'git remote set-branches' [--add] <name> <branch>...
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
'git remote set-url --add' [--push] <name> <newurl>
'git remote set-url --delete' [--push] <name> <url>
Oops, something went wrong.

0 comments on commit e0238c2

Please sign in to comment.