Autogenerated HTML docs for v1.8.3.2-804-g0da7a

RelNotes/1.8.4.txt

@@ -79,6 +79,13 @@ Foreign interfaces, subsystems and ports.
 
 UI, Workflows & Features
 
+ * "gitweb" learned to optionally place extra links that point at the
+   levels higher than the Gitweb pages themselves in the breadcrumbs,
+   so that it can be used as part of a larger installation.
+
+ * "git log --format=" now honors i18n.logoutputencoding configuration
+   variable.
+
  * The "push.default=simple" mode of "git push" has been updated to
    behave like "current" without requiring a remote tracking
    information, when you push to a remote that is different from where

cmds-mainporcelain.txt

@@ -71,7 +71,7 @@ linkgit:git-notes[1]::
 	Add or inspect object notes.
 
 linkgit:git-pull[1]::
-	Fetch from and merge with another repository or a local branch.
+	Fetch from and integrate with another repository or a local branch.
 
 linkgit:git-push[1]::
 	Update remote refs along with associated objects.

diff-options.txt

@@ -333,7 +333,7 @@ endif::git-log[]
 	a fraction, with a decimal point before it.  I.e., `-M5` becomes
 	0.5, and is thus the same as `-M50%`.  Similarly, `-M05` is
 	the same as `-M5%`.  To limit detection to exact renames, use
-	`-M100%`.
+	`-M100%`.  The default similarity index is 50%.
 
 -C[<n>]::
 --find-copies[=<n>]::

git-clone.html

@@ -1013,12 +1013,13 @@ <h2 id="_options">OPTIONS</h2>
 <p>
         Create a <em>shallow</em> clone with a history truncated to the
         specified number of revisions.  A shallow repository has a
-        number of limitations (you cannot clone or fetch from
-        it, nor push from nor into it), but is adequate if you
-        are only interested in the recent history of a large project
-        with a long history, and would want to send in fixes
-        as patches.
+        number of limitations (you cannot clone or fetch from it, nor
+        push into it), but is adequate if you are only interested in
+        the recent history of a large project with a long history.
 </p>
+<div class="paragraph"><p>Pushing from a shallow clone should be avoided if the git version on
+the receiver end is older than v1.7.10, or any other git
+implementation that does not perform connectivity check.</p></div>
 </dd>
 <dt class="hdlist1">
 --[no-]single-branch
@@ -1289,7 +1290,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-07-01 14:29:27 PDT
+Last updated 2013-07-12 15:46:35 PDT
 </div>
 </div>
 </body>

git-clone.txt

@@ -182,11 +182,13 @@ objects from the source repository into a pack in the cloned repository.
 --depth <depth>::
 	Create a 'shallow' clone with a history truncated to the
 	specified number of revisions.  A shallow repository has a
-	number of limitations (you cannot clone or fetch from
-	it, nor push from nor into it), but is adequate if you
-	are only interested in the recent history of a large project
-	with a long history, and would want to send in fixes
-	as patches.
+	number of limitations (you cannot clone or fetch from it, nor
+	push into it), but is adequate if you are only interested in
+	the recent history of a large project with a long history.
++
+Pushing from a shallow clone should be avoided if the git version on
+the receiver end is older than v1.7.10, or any other git
+implementation that does not perform connectivity check.
 
 --[no-]single-branch::
 	Clone only the history leading to the tip of a single branch,

git-config.html

@@ -1090,20 +1090,11 @@ <h2 id="FILES">FILES</h2>
 <em>git config</em> will search for configuration options:</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
-$GIT_DIR/config
-</dt>
-<dd>
-<p>
-        Repository specific configuration file.
-</p>
-</dd>
-<dt class="hdlist1">
-~/.gitconfig
+$(prefix)/etc/gitconfig
 </dt>
 <dd>
 <p>
-        User-specific configuration file. Also called "global"
-        configuration file.
+        System-wide configuration file.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -1120,11 +1111,20 @@ <h2 id="FILES">FILES</h2>
 </p>
 </dd>
 <dt class="hdlist1">
-$(prefix)/etc/gitconfig
+~/.gitconfig
 </dt>
 <dd>
 <p>
-        System-wide configuration file.
+        User-specific configuration file. Also called "global"
+        configuration file.
+</p>
+</dd>
+<dt class="hdlist1">
+$GIT_DIR/config
+</dt>
+<dd>
+<p>
+        Repository specific configuration file.
 </p>
 </dd>
 </dl></div>
@@ -1133,6 +1133,9 @@ <h2 id="FILES">FILES</h2>
 file are not available they will be ignored. If the repository configuration
 file is not available or readable, <em>git config</em> will exit with a non-zero
 error code. However, in neither case will an error message be issued.</p></div>
+<div class="paragraph"><p>The files are read in the order given above, with last value found taking
+precedence over values read earlier.  When multiple values are taken then all
+values of a key from all files will be used.</p></div>
 <div class="paragraph"><p>All writing options will per default write to the repository specific
 configuration file. Note that this also affects options like <em>--replace-all</em>
 and <em>--unset</em>. <strong><em>git config</em> will only ever change one file at a time</strong>.</p></div>
@@ -5855,7 +5858,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-07-03 17:43:56 PDT
+Last updated 2013-07-12 15:46:35 PDT
 </div>
 </div>
 </body>

git-config.txt

@@ -206,12 +206,8 @@ FILES
 If not set explicitly with '--file', there are four files where
 'git config' will search for configuration options:
 
-$GIT_DIR/config::
-	Repository specific configuration file.
-
-~/.gitconfig::
-	User-specific configuration file. Also called "global"
-	configuration file.
+$(prefix)/etc/gitconfig::
+	System-wide configuration file.
 
 $XDG_CONFIG_HOME/git/config::
 	Second user-specific configuration file. If $XDG_CONFIG_HOME is not set
@@ -221,15 +217,23 @@ $XDG_CONFIG_HOME/git/config::
 	you sometimes use older versions of Git, as support for this
 	file was added fairly recently.
 
-$(prefix)/etc/gitconfig::
-	System-wide configuration file.
+~/.gitconfig::
+	User-specific configuration file. Also called "global"
+	configuration file.
+
+$GIT_DIR/config::
+	Repository specific configuration file.
 
 If no further options are given, all reading options will read all of these
 files that are available. If the global or the system-wide configuration
 file are not available they will be ignored. If the repository configuration
 file is not available or readable, 'git config' will exit with a non-zero
 error code. However, in neither case will an error message be issued.
 
+The files are read in the order given above, with last value found taking
+precedence over values read earlier.  When multiple values are taken then all
+values of a key from all files will be used.
+
 All writing options will per default write to the repository specific
 configuration file. Note that this also affects options like '--replace-all'
 and '--unset'. *'git config' will only ever change one file at a time*.

git-diff-files.html

@@ -1276,7 +1276,7 @@ <h2 id="_options">OPTIONS</h2>
         a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
         0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
         the same as <code>-M5%</code>.  To limit detection to exact renames, use
-        <code>-M100%</code>.
+        <code>-M100%</code>.  The default similarity index is 50%.
 </p>
 </dd>
 <dt class="hdlist1">

git-diff-index.html

@@ -1277,7 +1277,7 @@ <h2 id="_options">OPTIONS</h2>
         a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
         0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
         the same as <code>-M5%</code>.  To limit detection to exact renames, use
-        <code>-M100%</code>.
+        <code>-M100%</code>.  The default similarity index is 50%.
 </p>
 </dd>
 <dt class="hdlist1">

git-diff-tree.html

@@ -1278,7 +1278,7 @@ <h2 id="_options">OPTIONS</h2>
         a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
         0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
         the same as <code>-M5%</code>.  To limit detection to exact renames, use
-        <code>-M100%</code>.
+        <code>-M100%</code>.  The default similarity index is 50%.
 </p>
 </dd>
 <dt class="hdlist1">

git-diff.html

@@ -1377,7 +1377,7 @@ <h2 id="_options">OPTIONS</h2>
         a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
         0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
         the same as <code>-M5%</code>.  To limit detection to exact renames, use
-        <code>-M100%</code>.
+        <code>-M100%</code>.  The default similarity index is 50%.
 </p>
 </dd>
 <dt class="hdlist1">

git-format-patch.html

@@ -1134,7 +1134,7 @@ <h2 id="_options">OPTIONS</h2>
         a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
         0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
         the same as <code>-M5%</code>.  To limit detection to exact renames, use
-        <code>-M100%</code>.
+        <code>-M100%</code>.  The default similarity index is 50%.
 </p>
 </dd>
 <dt class="hdlist1">

git-log.html

@@ -3129,7 +3129,7 @@ <h2 id="_common_diff_options">Common diff options</h2>
         a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
         0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
         the same as <code>-M5%</code>.  To limit detection to exact renames, use
-        <code>-M100%</code>.
+        <code>-M100%</code>.  The default similarity index is 50%.
 </p>
 </dd>
 <dt class="hdlist1">

git-name-rev.html

@@ -793,8 +793,10 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        Read from stdin, append "(&lt;rev_name&gt;)" to all sha1&#8217;s of nameable
-        commits, and pass to stdout
+        Transform stdin by substituting all the 40-character SHA-1
+        hexes (say $hex) with "$hex ($rev_name)".  When used with
+        --name-only, substitute with "$rev_name", omitting $hex
+        altogether.  Intended for the scripter&#8217;s use.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -859,7 +861,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-07-01 14:29:27 PDT
+Last updated 2013-07-12 15:46:35 PDT
 </div>
 </div>
 </body>

git-name-rev.txt

@@ -32,8 +32,10 @@ OPTIONS
 	List all commits reachable from all refs
 
 --stdin::
-	Read from stdin, append "(<rev_name>)" to all sha1's of nameable
-	commits, and pass to stdout
+	Transform stdin by substituting all the 40-character SHA-1
+	hexes (say $hex) with "$hex ($rev_name)".  When used with
+	--name-only, substitute with "$rev_name", omitting $hex
+	altogether.  Intended for the scripter's use.
 
 --name-only::
 	Instead of printing both the SHA-1 and the name, print only

git-p4.html

@@ -952,17 +952,18 @@ <h3 id="_sync_options">Sync options</h3>
 subsequent <em>sync</em> operations.</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
---branch &lt;branch&gt;
+--branch &lt;ref&gt;
 </dt>
 <dd>
 <p>
-        Import changes into given branch.  If the branch starts with
-        <em>refs/</em>, it will be used as is.  Otherwise if it does not start
-        with <em>p4/</em>, that prefix is added.  The branch is assumed to
-        name a remote tracking, but this can be modified using
-        <em>--import-local</em>, or by giving a full ref name.  The default
-        branch is <em>master</em>.
+        Import changes into &lt;ref&gt; instead of refs/remotes/p4/master.
+        If &lt;ref&gt; starts with refs/, it is used as is.  Otherwise, if
+        it does not start with p4/, that prefix is added.
 </p>
+<div class="paragraph"><p>By default a &lt;ref&gt; not starting with refs/ is treated as the
+name of a remote-tracking branch (under refs/remotes/).  This
+behavior can be modified using the --import-local option.</p></div>
+<div class="paragraph"><p>The default &lt;ref&gt; is "master".</p></div>
 <div class="paragraph"><p>This example imports a new remote "p4/proj2" into an existing
 Git repository:</p></div>
 <div class="listingblock">
@@ -1643,7 +1644,7 @@ <h2 id="_implementation_details">IMPLEMENTATION DETAILS</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-07-12 15:46:35 PDT
 </div>
 </div>
 </body>

git-p4.txt

@@ -176,13 +176,16 @@ Sync options
 These options can be used in the initial 'clone' as well as in
 subsequent 'sync' operations.
 
---branch <branch>::
-	Import changes into given branch.  If the branch starts with
-	'refs/', it will be used as is.  Otherwise if it does not start
-	with 'p4/', that prefix is added.  The branch is assumed to
-	name a remote tracking, but this can be modified using
-	'--import-local', or by giving a full ref name.  The default
-	branch is 'master'.
+--branch <ref>::
+	Import changes into <ref> instead of refs/remotes/p4/master.
+	If <ref> starts with refs/, it is used as is.  Otherwise, if
+	it does not start with p4/, that prefix is added.
++
+By default a <ref> not starting with refs/ is treated as the
+name of a remote-tracking branch (under refs/remotes/).  This
+behavior can be modified using the --import-local option.
++
+The default <ref> is "master".
 +
 This example imports a new remote "p4/proj2" into an existing
 Git repository:

git-pull.html

@@ -737,7 +737,7 @@ <h1>
 <h2>NAME</h2>
 <div class="sectionbody">
 <p>git-pull -
-   Fetch from and merge with another repository or a local branch
+   Fetch from and integrate with another repository or a local branch
 </p>
 </div>
 </div>
@@ -1884,7 +1884,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-03-27 15:10:17 PDT
+Last updated 2013-07-12 15:46:35 PDT
 </div>
 </div>
 </body>

git-pull.txt

@@ -3,7 +3,7 @@ git-pull(1)
 
 NAME
 ----
-git-pull - Fetch from and merge with another repository or a local branch
+git-pull - Fetch from and integrate with another repository or a local branch
 
 
 SYNOPSIS

git-submodule.html

@@ -1075,7 +1075,7 @@ <h2 id="_options">OPTIONS</h2>
 <p>
         This option is only valid for the update command.  Instead of using
         the superproject&#8217;s recorded SHA-1 to update the submodule, use the
-        status of the submodule&#8217;s remote tracking branch.  The remote used
+        status of the submodule&#8217;s remote-tracking branch.  The remote used
         is branch&#8217;s remote (<code>branch.&lt;name&gt;.remote</code>), defaulting to <code>origin</code>.
         The remote branch used defaults to <code>master</code>, but the branch name may
         be overridden by setting the <code>submodule.&lt;name&gt;.branch</code> option in
@@ -1209,7 +1209,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-05-17 16:33:07 PDT
+Last updated 2013-07-12 15:46:35 PDT
 </div>
 </div>
 </body>

git-submodule.txt

@@ -262,7 +262,7 @@ OPTIONS
 --remote::
 	This option is only valid for the update command.  Instead of using
 	the superproject's recorded SHA-1 to update the submodule, use the
-	status of the submodule's remote tracking branch.  The remote used
+	status of the submodule's remote-tracking branch.  The remote used
 	is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
 	The remote branch used defaults to `master`, but the branch name may
 	be overridden by setting the `submodule.<name>.branch` option in