Permalink
Browse files

Autogenerated HTML docs for v1.8.2.1-366-ge2af9

  • Loading branch information...
1 parent 63b6fdb commit 0eb115024d67a8c849fedcbee89005ed62b0cf08 @gitster committed Apr 12, 2013
Showing with 75 additions and 25 deletions.
  1. +21 −6 RelNotes/1.8.3.txt
  2. +4 −3 git-archive.html
  3. +3 −1 git-archive.txt
  4. +26 −8 git-help.html
  5. +21 −7 git-help.txt
View
@@ -32,6 +32,9 @@ Updates since v1.8.2
UI, Workflows & Features
+ * "git help" learned "-g" option to show the list of guides just like
+ list of commands are given with "-a".
+
* A triangular "pull from one place, push to another place" workflow
is supported better by new remote.pushdefault (overrides the
"origin" thing) and branch.*.pushremote (overrides the
@@ -41,11 +44,11 @@ UI, Workflows & Features
revert session, just like it does for a cherry-pick and a bisect
session.
- * The handing by "git branch --set-upstream-to" against various forms
- of errorneous inputs was suboptimal and has been improved.
+ * The handling by "git branch --set-upstream-to" against various forms
+ of erroneous inputs was suboptimal and has been improved.
* When the interactive access to git-shell is not enabled, it issues
- a message meant to help the system admininstrator to enable it.
+ a message meant to help the system administrator to enable it.
An explicit way to help the end users who connect to the service by
issuing custom messages to refuse such an access has been added.
@@ -113,6 +116,10 @@ Performance, Internal Implementation, etc.
* Updates for building under msvc.
+ * The logic to coalesce the same lines removed from the parents in
+ the output from "diff -c/--cc" has been updated, but with an O(n^2)
+ complexity, so this might turn out to be undesirable.
+
* The code to enforce permission bits on files in $GIT_DIR/ for
shared repositories have been simplified.
@@ -139,6 +146,9 @@ Performance, Internal Implementation, etc.
which have been consolidated. Also a bug in "git checkout dir/"
that is started from an unmerged index has been fixed.
+ * A few bugfixes to "git rerere" working on corner case merge
+ conflicts have been applied.
+
Also contains minor documentation updates and code clean-ups.
@@ -150,6 +160,11 @@ Unless otherwise noted, all the fixes since v1.8.2 in the maintenance
track are contained in this release (see release notes to them for
details).
+ * "git log -S/-G" started paying attention to textconv filter, but
+ there was no way to disable this. Make it honor --no-textconv
+ option.
+ (merge 61690bf sr/log-SG-no-textconv later to maint).
+
* When used with "-d temporary-directory" option, "git filter-branch"
failed to come back to the original working tree to perform the
final clean-up procedure.
@@ -179,8 +194,8 @@ details).
"--option=value" form.
(merge 862ae6c rs/submodule-summary-limit later to maint).
- * "index-pack --fix-thin" used uninitialize value to compute delta
- depths of objects it appends to the resulting pack.
+ * "index-pack --fix-thin" used an uninitialized value to compute
+ delta depths of objects it appends to the resulting pack.
(merge 57165db jk/index-pack-correct-depth-fix later to maint).
* "index-pack --verify-stat" used a few counters outside protection
@@ -294,4 +309,4 @@ details).
alphabetical order.
* "git submodule update", when recursed into sub-submodules, did not
- acccumulate the prefix paths.
+ accumulate the prefix paths.
View
@@ -833,7 +833,8 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Look for attributes in .gitattributes in working directory too.
+ Look for attributes in .gitattributes files in the working tree
+ as well (see <a href="#ATTRIBUTES">[ATTRIBUTES]</a>).
</p>
</dd>
<dt class="hdlist1">
@@ -960,7 +961,7 @@ <h2 id="_configuration">CONFIGURATION</h2>
</div>
</div>
<div class="sect1">
-<h2 id="_attributes">ATTRIBUTES</h2>
+<h2 id="ATTRIBUTES">ATTRIBUTES</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1087,7 +1088,7 @@ <h2 id="_git">GIT</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-04-11 19:13:58 PDT
</div>
</div>
</body>
View
@@ -56,7 +56,8 @@ OPTIONS
Write the archive to <file> instead of stdout.
--worktree-attributes::
- Look for attributes in .gitattributes in working directory too.
+ Look for attributes in .gitattributes files in the working tree
+ as well (see <<ATTRIBUTES>>).
<extra>::
This can be any options that the archiver backend understands.
@@ -120,6 +121,7 @@ tar.<format>.remote::
user-defined formats, but true for the "tar.gz" and "tgz"
formats.
+[[ATTRIBUTES]]
ATTRIBUTES
----------
View
@@ -746,24 +746,30 @@
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git help</em> [-a|--all|-i|--info|-m|--man|-w|--web] [COMMAND]</pre>
+<pre class="content"><em>git help</em> [-a|--all] [-g|--guide]
+ [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]</pre>
<div class="attribution">
</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>With no options and no COMMAND given, the synopsis of the <em>git</em>
+<div class="paragraph"><p>With no options and no COMMAND or GUIDE given, the synopsis of the <em>git</em>
command and a list of the most commonly used Git commands are printed
on the standard output.</p></div>
-<div class="paragraph"><p>If the option <em>--all</em> or <em>-a</em> is given, then all available commands are
+<div class="paragraph"><p>If the option <em>--all</em> or <em>-a</em> is given, all available commands are
printed on the standard output.</p></div>
-<div class="paragraph"><p>If a Git subcommand is named, a manual page for that subcommand is brought
-up. The <em>man</em> program is used by default for this purpose, but this
-can be overridden by other options or configuration variables.</p></div>
+<div class="paragraph"><p>If the option <em>--guide</em> or <em>-g</em> is given, a list of the useful
+Git guides is also printed on the standard output.</p></div>
+<div class="paragraph"><p>If a command, or a guide, is given, a manual page for that command or
+guide is brought up. The <em>man</em> program is used by default for this
+purpose, but this can be overridden by other options or configuration
+variables.</p></div>
<div class="paragraph"><p>Note that <code>git --help ...</code> is identical to <code>git help ...</code> because the
former is internally converted into the latter.</p></div>
+<div class="paragraph"><p>To display the <a href="git.html">git(1)</a> man page, use <code>git help git</code>.</p></div>
+<div class="paragraph"><p>This page can be displayed with <em>git help help</em> or <code>git help --help</code></p></div>
</div>
</div>
<div class="sect1">
@@ -779,7 +785,19 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
Prints all the available commands on the standard output. This
- option supersedes any other option.
+ option overrides any given command or guide name.
+</p>
+</dd>
+<dt class="hdlist1">
+-g
+</dt>
+<dt class="hdlist1">
+--guides
+</dt>
+<dd>
+<p>
+ Prints a list of useful guides on the standard output. This
+ option overrides any given command or guide name.
</p>
</dd>
<dt class="hdlist1">
@@ -965,7 +983,7 @@ <h2 id="_git">GIT</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-04-11 19:13:58 PDT
</div>
</div>
</body>
View
@@ -8,31 +8,45 @@ git-help - Display help information about Git
SYNOPSIS
--------
[verse]
-'git help' [-a|--all|-i|--info|-m|--man|-w|--web] [COMMAND]
+'git help' [-a|--all] [-g|--guide]
+ [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
DESCRIPTION
-----------
-With no options and no COMMAND given, the synopsis of the 'git'
+With no options and no COMMAND or GUIDE given, the synopsis of the 'git'
command and a list of the most commonly used Git commands are printed
on the standard output.
-If the option '--all' or '-a' is given, then all available commands are
+If the option '--all' or '-a' is given, all available commands are
printed on the standard output.
-If a Git subcommand is named, a manual page for that subcommand is brought
-up. The 'man' program is used by default for this purpose, but this
-can be overridden by other options or configuration variables.
+If the option '--guide' or '-g' is given, a list of the useful
+Git guides is also printed on the standard output.
+
+If a command, or a guide, is given, a manual page for that command or
+guide is brought up. The 'man' program is used by default for this
+purpose, but this can be overridden by other options or configuration
+variables.
Note that `git --help ...` is identical to `git help ...` because the
former is internally converted into the latter.
+To display the linkgit:git[1] man page, use `git help git`.
+
+This page can be displayed with 'git help help' or `git help --help`
+
OPTIONS
-------
-a::
--all::
Prints all the available commands on the standard output. This
- option supersedes any other option.
+ option overrides any given command or guide name.
+
+-g::
+--guides::
+ Prints a list of useful guides on the standard output. This
+ option overrides any given command or guide name.
-i::
--info::

0 comments on commit 0eb1150

Please sign in to comment.