Autogenerated HTML docs for v1.7.7-419-g87009

gitster · Oct 19, 2011 · 11821ed · 11821ed
1 parent 513ff12
commit 11821ed
Show file tree

Hide file tree

Showing 21 changed files with 4,943 additions and 3 deletions.
diff --git a/RelNotes/1.7.8.txt b/RelNotes/1.7.8.txt
@@ -4,7 +4,7 @@ Git v1.7.8 Release Notes (draft)
 Updates since v1.7.7
 --------------------
 
- * Some git-svn and git-gui updates.
+ * Some git-svn, git-gui and msysgit updates.
 
  * Updates to bash completion scripts.
 
@@ -40,6 +40,9 @@ Updates since v1.7.7
  * "git diff" learned "--minimal" option to spend extra cycles to come
    up with a minimal patch output.
 
+ * "git diff" learned "--function-context" option to show the whole
+   function as context that was affected by a change.
+
  * "git fetch" learned to honor transfer.fsckobjects configuration to
    validate the objects that were received from the other end, just like
    "git receive-pack" (the receiving end of "git push") does.
@@ -63,8 +66,16 @@ Updates since v1.7.7
     files in the working tree, so that matches in new but not yet
     added files do not get missed.
 
+ * The recursive merge backend no longer looks for meaningless
+   existing merges in submodules unless in the outermost merge.
+
+ * "git log" and friends learned "--children" option.
+
  * "git ls-remote" learned to respond to "-h"(elp) requests.
 
+ * "git merge" learned the "--edit" option to allow users to edit the
+   merge commit log message.
+
  * "git send-email" learned to respond to "-h"(elp) requests.
 
  * "git send-email" allows the value given to sendemail.aliasfile to begin
@@ -93,6 +104,8 @@ Updates since v1.7.7
  * "gitweb" leaked unescaped control characters from syntax hiliter
    outputs.
 
+ * "gitweb" now has its own manual pages.
+
 
 Also contains other documentation updates and minor code cleanups.
 
@@ -142,6 +155,9 @@ included in this release.
    of the file.
    (merge 8557263 jc/apply-blank-at-eof-fix later to maint).
 
+ * "git apply --index" did not check corrupted patch.
+   (merge 2c93286 jm/maint-apply-detects-corrupt-patch-header later to maint).
+
  * "git bisect" did not notice when it failed to update the working tree
    to the next commit to be tested.
    (merge 1acf11717 js/bisect-no-checkout later to maint).
@@ -179,13 +195,17 @@ included in this release.
    hooks for attempted removal of non-existing refs.
    (merge 160b81ed ph/push-to-delete-nothing later to maint).
 
+ * "git send-email" did not honor the configured hostname when restarting
+   the HELO/EHLO exchange after switching TLS on.
+   (merge 155b940 md/smtp-tls-hello-again later to maint).
+
  * "gitweb" used to produce a non-working link while showing the contents
    of a blob, when JavaScript actions are enabled.
    (merge 2b07ff3ff ps/gitweb-js-with-lineno later to maint).
 
 ---
 exec >/var/tmp/1
-O=v1.7.7-368-g9638384
+O=v1.7.7-418-g40d6987
 echo O=$(git describe --always master)
 git log --first-parent --oneline --reverse ^$O master
 echo

diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt
@@ -43,3 +43,6 @@ linkgit:git-verify-tag[1]::
 linkgit:git-whatchanged[1]::
 	Show logs with difference each commit introduces.
 
+linkgit:gitweb[1]::
+	Git web interface (web frontend to Git repositories).
+
diff --git a/config.txt b/config.txt
@@ -1071,6 +1071,23 @@ All gitcvs variables except for 'gitcvs.usecrlfattr' and
 is one of "ext" and "pserver") to make them apply only for the given
 access method.
 
+gitweb.category::
+gitweb.description::
+gitweb.owner::
+gitweb.url::
+	See linkgit:gitweb[1] for description.
+
+gitweb.avatar::
+gitweb.blame::
+gitweb.grep::
+gitweb.highlight::
+gitweb.patches::
+gitweb.pickaxe::
+gitweb.remote_heads::
+gitweb.showsizes::
+gitweb.snapshot::
+	See linkgit:gitweb.conf[5] for description.
+
 grep.lineNumber::
 	If set to true, enable '-n' option by default.
 

diff --git a/diff-options.txt b/diff-options.txt
@@ -408,6 +408,10 @@ endif::git-format-patch[]
 	Show the context between diff hunks, up to the specified number
 	of lines, thereby fusing hunks that are close to each other.
 
+-W::
+--function-context::
+	Show whole surrounding functions of changes.
+
 ifndef::git-format-patch[]
 --exit-code::
 	Make the program exit with codes similar to diff(1).

diff --git a/git-config.html b/git-config.html
@@ -2999,6 +2999,55 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
 access method.</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
+gitweb.category
+</dt>
+<dt class="hdlist1">
+gitweb.description
+</dt>
+<dt class="hdlist1">
+gitweb.owner
+</dt>
+<dt class="hdlist1">
+gitweb.url
+</dt>
+<dd>
+<p>
+        See <a href="gitweb.html">gitweb(1)</a> for description.
+</p>
+</dd>
+<dt class="hdlist1">
+gitweb.avatar
+</dt>
+<dt class="hdlist1">
+gitweb.blame
+</dt>
+<dt class="hdlist1">
+gitweb.grep
+</dt>
+<dt class="hdlist1">
+gitweb.highlight
+</dt>
+<dt class="hdlist1">
+gitweb.patches
+</dt>
+<dt class="hdlist1">
+gitweb.pickaxe
+</dt>
+<dt class="hdlist1">
+gitweb.remote_heads
+</dt>
+<dt class="hdlist1">
+gitweb.showsizes
+</dt>
+<dt class="hdlist1">
+gitweb.snapshot
+</dt>
+<dd>
+<p>
+        See <a href="gitweb.conf.html">gitweb.conf(5)</a> for description.
+</p>
+</dd>
+<dt class="hdlist1">
 grep.lineNumber
 </dt>
 <dd>

diff --git a/git-diff-files.html b/git-diff-files.html
@@ -1235,6 +1235,17 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-W
+</dt>
+<dt class="hdlist1">
+--function-context
+</dt>
+<dd>
+<p>
+        Show whole surrounding functions of changes.
+</p>
+</dd>
+<dt class="hdlist1">
 --exit-code
 </dt>
 <dd>

diff --git a/git-diff-index.html b/git-diff-index.html
@@ -1236,6 +1236,17 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-W
+</dt>
+<dt class="hdlist1">
+--function-context
+</dt>
+<dd>
+<p>
+        Show whole surrounding functions of changes.
+</p>
+</dd>
+<dt class="hdlist1">
 --exit-code
 </dt>
 <dd>

diff --git a/git-diff-tree.html b/git-diff-tree.html
@@ -1237,6 +1237,17 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-W
+</dt>
+<dt class="hdlist1">
+--function-context
+</dt>
+<dd>
+<p>
+        Show whole surrounding functions of changes.
+</p>
+</dd>
+<dt class="hdlist1">
 --exit-code
 </dt>
 <dd>

diff --git a/git-diff.html b/git-diff.html
@@ -1325,6 +1325,17 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-W
+</dt>
+<dt class="hdlist1">
+--function-context
+</dt>
+<dd>
+<p>
+        Show whole surrounding functions of changes.
+</p>
+</dd>
+<dt class="hdlist1">
 --exit-code
 </dt>
 <dd>

diff --git a/git-format-patch.html b/git-format-patch.html
@@ -1018,6 +1018,17 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-W
+</dt>
+<dt class="hdlist1">
+--function-context
+</dt>
+<dd>
+<p>
+        Show whole surrounding functions of changes.
+</p>
+</dd>
+<dt class="hdlist1">
 --ext-diff
 </dt>
 <dd>

diff --git a/git-instaweb.html b/git-instaweb.html
@@ -716,6 +716,10 @@ <h2 id="_configuration">CONFIGURATION</h2>
 <em>web.browser</em> will be used instead if it is defined. See
 <a href="git-web&#45;&#45;browse.html">git-web&#45;&#45;browse(1)</a> for more information about this.</p></div>
 </div>
+<h2 id="_see_also">SEE ALSO</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><a href="gitweb.html">gitweb(1)</a></p></div>
+</div>
 <h2 id="_git">GIT</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -724,7 +728,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-09-21 23:01:14 PDT
+Last updated 2011-10-19 11:41:17 PDT
 </div>
 </div>
 </body>

diff --git a/git-instaweb.txt b/git-instaweb.txt
@@ -84,6 +84,10 @@ If the configuration variable 'instaweb.browser' is not set,
 'web.browser' will be used instead if it is defined. See
 linkgit:git-web{litdd}browse[1] for more information about this.
 
+SEE ALSO
+--------
+linkgit:gitweb[1]
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/git-log.html b/git-log.html
@@ -2831,6 +2831,17 @@ <h2 id="_common_diff_options">Common diff options</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-W
+</dt>
+<dt class="hdlist1">
+--function-context
+</dt>
+<dd>
+<p>
+        Show whole surrounding functions of changes.
+</p>
+</dd>
+<dt class="hdlist1">
 --exit-code
 </dt>
 <dd>

diff --git a/git-merge.html b/git-merge.html
@@ -650,6 +650,19 @@ <h2 id="_options">OPTIONS</h2>
 inspect and further tweak the merge result before committing.</p></div>
 </dd>
 <dt class="hdlist1">
+--edit
+</dt>
+<dt class="hdlist1">
+-e
+</dt>
+<dd>
+<div class="literalblock">
+<div class="content">
+<pre><tt>Invoke editor before committing successful merge to further
+edit the default merge message.</tt></pre>
+</div></div>
+</dd>
+<dt class="hdlist1">
 --ff
 </dt>
 <dt class="hdlist1">

diff --git a/git-pull.html b/git-pull.html
@@ -697,6 +697,19 @@ <h3 id="_options_related_to_merging">Options related to merging</h3><div style="
 inspect and further tweak the merge result before committing.</p></div>
 </dd>
 <dt class="hdlist1">
+--edit
+</dt>
+<dt class="hdlist1">
+-e
+</dt>
+<dd>
+<div class="literalblock">
+<div class="content">
+<pre><tt>Invoke editor before committing successful merge to further
+edit the default merge message.</tt></pre>
+</div></div>
+</dd>
+<dt class="hdlist1">
 --ff
 </dt>
 <dt class="hdlist1">

diff --git a/git.html b/git.html
@@ -1318,6 +1318,14 @@ <h3 id="_ancillary_commands">Ancillary Commands</h3><div style="clear:left"></di
         Show logs with difference each commit introduces.
 </p>
 </dd>
+<dt class="hdlist1">
+<a href="gitweb.html">gitweb(1)</a>
+</dt>
+<dd>
+<p>
+        Git web interface (web frontend to Git repositories).
+</p>
+</dd>
 </dl></div>
 <h3 id="_interacting_with_others">Interacting with Others</h3><div style="clear:left"></div>
 <div class="paragraph"><p>These commands are to interact with foreign SCM and with other