Permalink
Browse files

Autogenerated HTML docs for v1.7.11-2-gd28436

  • Loading branch information...
1 parent 9f9ed8b commit 010705ace148110d091fef2fb78d70223306d9e0 @gitster committed Jun 19, 2012
Showing with 38 additions and 29 deletions.
  1. +12 −0 RelNotes/1.7.10.5.txt
  2. +0 −9 RelNotes/1.7.11.txt
  3. +1 −1 diff-config.txt
  4. +2 −2 git-column.html
  5. +1 −1 git-column.txt
  6. +3 −3 git-commit-tree.html
  7. +2 −2 git-commit-tree.txt
  8. +1 −1 git-config.html
  9. +2 −2 git.html
  10. +8 −2 git.txt
  11. +2 −2 gitweb.conf.html
  12. +1 −1 gitweb.conf.txt
  13. +2 −2 user-manual.html
  14. +1 −1 user-manual.txt
View
@@ -0,0 +1,12 @@
+Git v1.7.10.5 Release Notes
+===========================
+
+Fixes since v1.7.10.4
+---------------------
+
+ * "git fast-export" did not give a readable error message when the
+ same mark erroneously appeared twice in the --import-marks input.
+
+ * "git rebase -p" used to pay attention to rebase.autosquash which
+ was wrong. "git rebase -p -i" should, but "git rebase -p" by
+ itself should not.
View
@@ -130,15 +130,6 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
releases are contained in this release (see release notes to them for
details).
- * "git fast-export" did not give a readable error message when the
- same mark erroneously appeared twice in the --import-marks input.
- (merge 43bc230 js/maint-fast-export-mark-error later to maint).
-
- * "git rebase -p" used to pay attention to rebase.autosquash which
- was wrong. "git rebase -p -i" should, but "git rebase -p" by
- itself should not.
- (cherry-pick 8a6dae1 vr/rebase-autosquash-does-not-imply-i later to maint).
-
* "git submodule init" used to report "registered for path ..."
even for submodules that were registered earlier.
(cherry-pick c1c259e jl/submodule-report-new-path-once later to maint).
View
@@ -54,7 +54,7 @@ and accumulating child directory counts in the parent directories:
diff.statGraphWidth::
Limit the width of the graph part in --stat output. If set, applies
- to all commands generating --stat outuput except format-patch.
+ to all commands generating --stat output except format-patch.
diff.external::
If this config variable is set, diff generation is not
View
@@ -584,7 +584,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git column</em> [--command=&lt;name&gt;] [--[raw-]mode=&lt;mode&gt;] [--width=&lt;width&gt;]
- [--indent=&lt;string&gt;] [--nl=&lt;string&gt;] [--pading=&lt;n&gt;]</div>
+ [--indent=&lt;string&gt;] [--nl=&lt;string&gt;] [--padding=&lt;n&gt;]</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -670,7 +670,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-03 16:06:58 PDT
+Last updated 2012-06-19 16:36:49 PDT
</div>
</div>
</body>
View
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
- [--indent=<string>] [--nl=<string>] [--pading=<n>]
+ [--indent=<string>] [--nl=<string>] [--padding=<n>]
DESCRIPTION
-----------
View
@@ -584,7 +584,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git commit-tree</em> &lt;tree&gt; [(-p &lt;parent&gt;)&#8230;] &lt; changelog
-<em>git commit-tree</em> [(-p &lt;parent&gt;)&#8230;] [(-m &lt;message&gt;)&#8230;] [(-F &lt;file&gt;)&#8230;] &lt;tree&gt;</div>
+<em>git commit-tree</em> &lt;tree&gt; [(-p &lt;parent&gt;)&#8230;] [(-m &lt;message&gt;)&#8230;] [(-F &lt;file&gt;)&#8230;]</div>
<div class="verseblock-attribution">
</div></div>
</div>
@@ -632,7 +632,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- A paragraph in the commig log message. This can be given more than
+ A paragraph in the commit log message. This can be given more than
once and each &lt;message&gt; becomes its own paragraph.
</p>
</dd>
@@ -827,7 +827,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-30 14:00:59 PDT
+Last updated 2012-06-19 16:36:49 PDT
</div>
</div>
</body>
View
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git commit-tree' <tree> [(-p <parent>)...] < changelog
-'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree>
+'git commit-tree' <tree> [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...]
DESCRIPTION
-----------
@@ -45,7 +45,7 @@ OPTIONS
Each '-p' indicates the id of a parent commit object.
-m <message>::
- A paragraph in the commig log message. This can be given more than
+ A paragraph in the commit log message. This can be given more than
once and each <message> becomes its own paragraph.
-F <file>::
View
@@ -2612,7 +2612,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
<dd>
<p>
Limit the width of the graph part in --stat output. If set, applies
- to all commands generating --stat outuput except format-patch.
+ to all commands generating --stat output except format-patch.
</p>
</dd>
<dt class="hdlist1">
View
@@ -2151,7 +2151,7 @@ <h3 id="_other">other</h3><div style="clear:left"></div>
<dd>
<p>
This environment variable overrides <tt>$EDITOR</tt> and <tt>$VISUAL</tt>.
- It is used by several git comands when, on interactive mode,
+ It is used by several git commands when, on interactive mode,
an editor is to be launched. See also
and the <tt>core.editor</tt> option in .
</p>
@@ -2297,7 +2297,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-06-03 16:29:07 PDT
+Last updated 2012-06-19 16:36:49 PDT
</div>
</div>
</body>
View
10 git.txt
@@ -44,9 +44,15 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.7.10.4/git.html[documentation for release 1.7.10.4]
+* link:v1.7.11/git.html[documentation for release 1.7.11]
* release notes for
+ link:RelNotes/1.7.11.txt[1.7.11].
+
+* link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
+
+* release notes for
+ link:RelNotes/1.7.10.5.txt[1.7.10.5],
link:RelNotes/1.7.10.4.txt[1.7.10.4],
link:RelNotes/1.7.10.3.txt[1.7.10.3],
link:RelNotes/1.7.10.2.txt[1.7.10.2],
@@ -728,7 +734,7 @@ other
'GIT_EDITOR'::
This environment variable overrides `$EDITOR` and `$VISUAL`.
- It is used by several git comands when, on interactive mode,
+ It is used by several git commands when, on interactive mode,
an editor is to be launched. See also linkgit:git-var[1]
and the `core.editor` option in linkgit:git-config[1].
View
@@ -843,7 +843,7 @@ <h3 id="_finding_files">Finding files</h3><div style="clear:left"></div>
By default set to <em>highlight</em>; set it to full path to highlight
executable if it is not installed on your web server&#8217;s PATH.
Note that <em>highlight</em> feature must be set for gitweb to actually
- use syntax hightlighting.
+ use syntax highlighting.
</p>
<div class="paragraph"><p><strong>NOTE</strong>: if you want to add support for new file type (supported by
"highlight" but not used by gitweb), you need to modify <tt>%highlight_ext</tt>
@@ -1723,7 +1723,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2012-06-19 16:36:49 PDT
</div>
</div>
</body>
View
@@ -244,7 +244,7 @@ $highlight_bin::
By default set to 'highlight'; set it to full path to highlight
executable if it is not installed on your web server's PATH.
Note that 'highlight' feature must be set for gitweb to actually
- use syntax hightlighting.
+ use syntax highlighting.
+
*NOTE*: if you want to add support for new file type (supported by
"highlight" but not used by gitweb), you need to modify `%highlight_ext`
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1600,7 +1600,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
You will see informational messages on dangling objects. They are objects
that still exist in the repository but are no longer referenced by any of
your branches, and can (and will) be removed after a while with "gc".
-You can run `git fsck --no-dangling` to supress these messages, and still
+You can run `git fsck --no-dangling` to suppress these messages, and still
view real errors.
[[recovering-lost-changes]]

0 comments on commit 010705a

Please sign in to comment.