Autogenerated HTML docs for v1.7.12.1-401-gb5d15

gitster · Sep 24, 2012 · 0acb1ae · 0acb1ae
1 parent 8ce35d7
commit 0acb1ae
Show file tree

Hide file tree

Showing 10 changed files with 168 additions and 7 deletions.
diff --git a/RelNotes/1.7.12.2.txt b/RelNotes/1.7.12.2.txt
@@ -0,0 +1,32 @@
+Git 1.7.12.2 Release Notes
+==========================
+
+Fixes since v1.7.12.1
+---------------------
+
+ * Even during a conflicted merge, "git blame $path" always meant to
+   blame uncommitted changes to the "working tree" version; make it
+   more useful by showing cleanly merged parts as coming from the other
+   branch that is being merged.
+
+ * "git blame MAKEFILE" run in a history that has "Makefile" but not
+   "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
+   confused on a case insensitive filesystem and failed to do so.
+
+ * "git fetch --all", when passed "--no-tags", did not honor the
+   "--no-tags" option while fetching from individual remotes (the same
+   issue existed with "--tags", but combination "--all --tags" makes
+   much less sense than "--all --no-tags").
+
+ * "git log/diff/format-patch --stat" showed the "N line(s) added"
+   comment in user's locale and caused careless submitters to send
+   patches with such a line in them to projects whose project language
+   is not their language, mildly irritating others. Localization to
+   the line has been disabled for now.
+
+ * The subcommand to remove the definition of a remote in "git remote"
+   was named "rm" even though all other subcommands were spelled out.
+   Introduce "git remote remove" to remove confusion, and keep "rm" as
+   a backward compatible synonym.
+
+Also contains a handful of documentation updates.
diff --git a/git-diff-tree.html b/git-diff-tree.html
@@ -1568,6 +1568,15 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+--show-signature
+</dt>
+<dd>
+<p>
+        Check the validity of a signed commit object by passing the signature
+        to <tt>gpg --verify</tt> and show the output.
+</p>
+</dd>
+<dt class="hdlist1">
 --no-commit-id
 </dt>
 <dd>
@@ -1919,6 +1928,21 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </li>
 <li>
 <p>
+<em>%GG</em>: raw verification message from GPG for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%G?</em>: show either "G" for Good or "B" for Bad for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%GS</em>: show the name of the signer for a signed commit
+</p>
+</li>
+<li>
+<p>
 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
 </p>
 </li>

diff --git a/git-log.html b/git-log.html
@@ -1627,6 +1627,15 @@ <h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div>
 </p>
 </dd>
 <dt class="hdlist1">
+--show-signature
+</dt>
+<dd>
+<p>
+        Check the validity of a signed commit object by passing the signature
+        to <tt>gpg --verify</tt> and show the output.
+</p>
+</dd>
+<dt class="hdlist1">
 --relative-date
 </dt>
 <dd>
@@ -2088,6 +2097,21 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </li>
 <li>
 <p>
+<em>%GG</em>: raw verification message from GPG for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%G?</em>: show either "G" for Good or "B" for Bad for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%GS</em>: show the name of the signer for a signed commit
+</p>
+</li>
+<li>
+<p>
 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
 </p>
 </li>

diff --git a/git-rev-list.html b/git-rev-list.html
@@ -1702,6 +1702,15 @@ <h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div>
 </p>
 </dd>
 <dt class="hdlist1">
+--show-signature
+</dt>
+<dd>
+<p>
+        Check the validity of a signed commit object by passing the signature
+        to <tt>gpg --verify</tt> and show the output.
+</p>
+</dd>
+<dt class="hdlist1">
 --relative-date
 </dt>
 <dd>
@@ -2128,6 +2137,21 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </li>
 <li>
 <p>
+<em>%GG</em>: raw verification message from GPG for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%G?</em>: show either "G" for Good or "B" for Bad for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%GS</em>: show the name of the signer for a signed commit
+</p>
+</li>
+<li>
+<p>
 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
 </p>
 </li>

diff --git a/git-show.html b/git-show.html
@@ -721,6 +721,15 @@ <h2 id="_options">OPTIONS</h2>
         options instead.
 </p>
 </dd>
+<dt class="hdlist1">
+--show-signature
+</dt>
+<dd>
+<p>
+        Check the validity of a signed commit object by passing the signature
+        to <tt>gpg --verify</tt> and show the output.
+</p>
+</dd>
 </dl></div>
 </div>
 <h2 id="_pretty_formats">PRETTY FORMATS</h2>
@@ -1025,6 +1034,21 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </li>
 <li>
 <p>
+<em>%GG</em>: raw verification message from GPG for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%G?</em>: show either "G" for Good or "B" for Bad for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%GS</em>: show the name of the signer for a signed commit
+</p>
+</li>
+<li>
+<p>
 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
 </p>
 </li>

diff --git a/git-whatchanged.html b/git-whatchanged.html
@@ -753,6 +753,15 @@ <h2 id="_options">OPTIONS</h2>
         options instead.
 </p>
 </dd>
+<dt class="hdlist1">
+--show-signature
+</dt>
+<dd>
+<p>
+        Check the validity of a signed commit object by passing the signature
+        to <tt>gpg --verify</tt> and show the output.
+</p>
+</dd>
 </dl></div>
 </div>
 <h2 id="_pretty_formats">PRETTY FORMATS</h2>
@@ -1057,6 +1066,21 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
 </li>
 <li>
 <p>
+<em>%GG</em>: raw verification message from GPG for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%G?</em>: show either "G" for Good or "B" for Bad for a signed commit
+</p>
+</li>
+<li>
+<p>
+<em>%GS</em>: show the name of the signer for a signed commit
+</p>
+</li>
+<li>
+<p>
 <em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
 </p>
 </li>

diff --git a/pretty-formats.txt b/pretty-formats.txt
@@ -130,6 +130,9 @@ The placeholders are:
 - '%b': body
 - '%B': raw body (unwrapped subject and body)
 - '%N': commit notes
+- '%GG': raw verification message from GPG for a signed commit
+- '%G?': show either "G" for Good or "B" for Bad for a signed commit
+- '%GS': show the name of the signer for a signed commit
 - '%gD': reflog selector, e.g., `refs/stash@{1}`
 - '%gd': shortened reflog selector, e.g., `stash@{1}`
 - '%gn': reflog identity name

diff --git a/pretty-options.txt b/pretty-options.txt
@@ -66,3 +66,7 @@ being displayed. Examples: "--notes=foo" will show only notes from
 --[no-]standard-notes::
 	These options are deprecated. Use the above --notes/--no-notes
 	options instead.
+
+--show-signature::
+	Check the validity of a signed commit object by passing the signature
+	to `gpg --verify` and show the output.
diff --git a/technical/api-string-list.html b/technical/api-string-list.html
@@ -556,8 +556,9 @@ <h1>string-list API</h1>
 <div id="content">
 <div id="preamble">
 <div class="sectionbody">
-<div class="paragraph"><p>The string_list API offers a data structure and functions to handle sorted
+<div class="paragraph"><p>The string_list API offers a data structure and functions to handle
-and unsorted string lists.</p></div>
+sorted and unsorted string lists.  A "sorted" list is one whose
+entries are sorted by string value in <tt>strcmp()</tt> order.</p></div>
 <div class="paragraph"><p>The <em>string_list</em> struct used to be called <em>path_list</em>, but was renamed
 because it is not specific to paths.</p></div>
 <div class="paragraph"><p>The caller:</p></div>
@@ -785,7 +786,7 @@ <h2 id="_functions">Functions</h2>
 </dt>
 <dd>
 <p>
-        Make an unsorted list sorted.
+        Sort the list&#8217;s entries by string value in <tt>strcmp()</tt> order.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -892,7 +893,7 @@ <h2 id="_data_structures">Data structures</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-09-17 16:55:59 PDT
+Last updated 2012-09-24 14:27:45 PDT
 </div>
 </div>
 </body>

diff --git a/technical/api-string-list.txt b/technical/api-string-list.txt
@@ -1,8 +1,9 @@
 string-list API
 ===============
 
-The string_list API offers a data structure and functions to handle sorted
+The string_list API offers a data structure and functions to handle
-and unsorted string lists.
+sorted and unsorted string lists.  A "sorted" list is one whose
+entries are sorted by string value in `strcmp()` order.
 
 The 'string_list' struct used to be called 'path_list', but was renamed
 because it is not specific to paths.
@@ -143,7 +144,7 @@ write `string_list_insert(...)->util = ...;`.
 
 `sort_string_list`::
 
-	Make an unsorted list sorted.
+	Sort the list's entries by string value in `strcmp()` order.
 
 `unsorted_string_list_has_string`::