Permalink
Browse files

Autogenerated HTML docs for v1.7.10-rc3-3-g19a6c

  • Loading branch information...
gitster committed Mar 31, 2012
1 parent 892d90e commit 0ff9816f16e3ca9d26616328e79bb9a12e8f3a1e
View
@@ -29,16 +29,36 @@ Compatibility Notes
while and were deprecated in mid 2008 (v1.6.0). When you give these
options to "git am", it will now warn and ask you not to use them.
+ * When you do not tell which branches and tags to push to the "git push"
+ command in any way, the command used "matching refs" rule to update
+ remote branches and tags with branches and tags with the same name you
+ locally have. In future versions of Git, this will change to use the
+ "upstream" rule to update the branch at the remote you would "pull"
+ from into your current branch with your local current branch. The
+ release after 1.7.10 will start issuing a warning about this change,
+ to encourage you to tell the command what to push out, e.g. by setting
+ push.default configuration.
+
Updates since v1.7.9
--------------------
UI, Workflows & Features
+ * various "gitk" updates.
+ - show the path to the top level directory in the window title
+ - update preference edit dialog
+ - display file list correctly when directories are given on command line
+ - make "git-describe" output in the log message into a clickable link
+ - avoid matching the UNIX timestamp part when searching all fields
+ - give preference to symbolic font names like sans & monospace
+ - allow comparing two commits using a mark
+ - "gitk" honors log.showroot configuration.
+
* Teams for localizing the messages from the Porcelain layer of
commands are starting to form, thanks to Jiang Xin who volunteered
- to be the localization coordinator. An initial set of translated
- messages for simplified chinese is available.
+ to be the localization coordinator. Translated messages for
+ simplified Chinese and Swedish are available.
* The configuration mechanism learned an "include" facility; an
assignment to the include.path pseudo-variable causes the named
@@ -180,35 +200,17 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
details).
- * "git fast-import" accepted "ls" command with an empty path by
- mistake.
- (merge 178e1de jn/maint-fast-import-empty-ls later to maint).
-
- * The "remaining" subcommand to "git rerere" was not documented.
- (merge 3e7a1df ph/rerere-doc later to maint).
+ * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work
+ with versions of Perl older than 5.8.3.
+ (merge 5eb660e ab/perl-i18n later to maint).
* "git tag -s" honored "gpg.program" configuration variable since
1.7.9, but "git tag -v" and "git verify-tag" didn't.
(merge a2c2506 az/verify-tag-use-gpg-config later to maint).
- * When "git config" diagnoses an error in a configuration file and
- shows the line number for the offending line, it miscounted if the
- error was at the end of line.
- (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint).
-
- * "configure" script learned to take "--sane-tool-path" from the
- command line to record SANE_TOOL_PATH (used to avoid broken
- platform tools in /usr/bin) in config.mak-autogen. This may be useful
- for people on Solaris who have saner tools outside /usr/xpg[46]/bin.
-
- * "gitweb" used to drop warnings in the log file when "heads" view is
- accessed in a repository whose HEAD does not point at a valid
- branch.
-
----
-exec >/var/tmp/1
-O=v1.7.10-rc1-18-g0987145
-echo O=$(git describe)
-git log --first-parent --oneline ^maint $O..
-echo
-git shortlog --no-merges ^maint $O..
+ * "configure" script learned to take "--with-sane-tool-path" from the
+ command line to record SANE_TOOL_PATH (used to avoid broken platform
+ tools in /usr/bin) in config.mak.autogen. This may be useful for
+ people on Solaris who have saner tools outside /usr/xpg[46]/bin.
+
+ * zsh port of bash completion script needed another workaround.
View
@@ -0,0 +1,23 @@
+Git v1.7.9.5 Release Notes
+==========================
+
+Fixes since v1.7.9.4
+--------------------
+
+ * When "git config" diagnoses an error in a configuration file and
+ shows the line number for the offending line, it miscounted if the
+ error was at the end of line.
+
+ * "git fast-import" accepted "ls" command with an empty path by
+ mistake.
+
+ * Various new-ish output decoration modes of "git grep" were not
+ documented in the manual's synopsis section.
+
+ * The "remaining" subcommand to "git rerere" was not documented.
+
+ * "gitweb" used to drop warnings in the log file when "heads" view is
+ accessed in a repository whose HEAD does not point at a valid
+ branch.
+
+Also contains minor fixes and documentation updates.
View
@@ -594,7 +594,9 @@ <h2 id="_synopsis">SYNOPSIS</h2>
[-c | --count] [--all-match] [-q | --quiet]
[--max-depth &lt;depth&gt;]
[--color[=&lt;when&gt;] | --no-color]
+ [--break] [--heading] [-p | --show-function]
[-A &lt;post-context&gt;] [-B &lt;pre-context&gt;] [-C &lt;context&gt;]
+ [-W | --function-context]
[-f &lt;file&gt;] [-e] &lt;pattern&gt;
[--and|--or|--not|(|)|-e &lt;pattern&gt;&#8230;]
[ [--exclude-standard] [--cached | --no-index | --untracked] | &lt;tree&gt;&#8230;]
@@ -1117,7 +1119,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-01-18 16:51:00 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>
View
@@ -20,7 +20,9 @@ SYNOPSIS
[-c | --count] [--all-match] [-q | --quiet]
[--max-depth <depth>]
[--color[=<when>] | --no-color]
+ [--break] [--heading] [-p | --show-function]
[-A <post-context>] [-B <pre-context>] [-C <context>]
+ [-W | --function-context]
[-f <file>] [-e] <pattern>
[--and|--or|--not|(|)|-e <pattern>...]
[ [--exclude-standard] [--cached | --no-index | --untracked] | <tree>...]
View
@@ -1316,11 +1316,7 @@ <h2 id="_interactive_mode">INTERACTIVE MODE</h2>
</li>
</ol></div>
<div class="paragraph"><p>where point 2. consists of several instances of</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-regular use
-</p>
+<div class="paragraph"><p>a) regular use</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -1333,11 +1329,7 @@ <h2 id="_interactive_mode">INTERACTIVE MODE</h2>
</p>
</li>
</ol></div>
-</li>
-<li>
-<p>
-independent fixup
-</p>
+<div class="paragraph"><p>b) independent fixup</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -1355,8 +1347,6 @@ <h2 id="_interactive_mode">INTERACTIVE MODE</h2>
</p>
</li>
</ol></div>
-</li>
-</ol></div>
<div class="paragraph"><p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite
perfect commit it fixes, because that commit is buried deeply in a
patch series. That is exactly what interactive rebase is for: use it
@@ -1658,7 +1648,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>
View
@@ -409,10 +409,13 @@ The interactive mode is meant for this type of workflow:
where point 2. consists of several instances of
-a. regular use
+a) regular use
+
1. finish something worthy of a commit
2. commit
-b. independent fixup
+
+b) independent fixup
+
1. realize that something does not work
2. fix that
3. commit it
@@ -600,7 +600,7 @@ <h2 id="_description">DESCRIPTION</h2>
<div class="paragraph"><p><em>git sh-i18n&#45;&#45;envsubst</em> is Git&#8217;s stripped-down copy of the GNU
<tt>envsubst(1)</tt> program that comes with the GNU gettext package. It&#8217;s
used internally by <a href="git-sh-i18n.html">git-sh-i18n(1)</a> to interpolate the variables
-passed to the the <tt>eval_gettext</tt> function.</p></div>
+passed to the <tt>eval_gettext</tt> function.</p></div>
<div class="paragraph"><p>No promises are made about the interface, or that this
program won&#8217;t disappear without warning in the next version
of Git. Don&#8217;t use it.</p></div>
@@ -613,7 +613,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>
@@ -25,7 +25,7 @@ plumbing scripts and/or are writing new ones.
'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU
`envsubst(1)` program that comes with the GNU gettext package. It's
used internally by linkgit:git-sh-i18n[1] to interpolate the variables
-passed to the the `eval_gettext` function.
+passed to the `eval_gettext` function.
No promises are made about the interface, or that this
program won't disappear without warning in the next version
View
@@ -785,7 +785,7 @@ <h2 id="_commands">COMMANDS</h2>
<p>
Synchronizes submodules' remote URL configuration setting
to the value specified in .gitmodules. It will only affect those
- submodules which already have an url entry in .git/config (that is the
+ submodules which already have a URL entry in .git/config (that is the
case when they are initialized or freshly added). This is useful when
submodule URLs change upstream and you need to update your local
repositories accordingly.
@@ -971,7 +971,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-01-03 16:22:22 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>
View
@@ -190,7 +190,7 @@ commit for each submodule.
sync::
Synchronizes submodules' remote URL configuration setting
to the value specified in .gitmodules. It will only affect those
- submodules which already have an url entry in .git/config (that is the
+ submodules which already have a URL entry in .git/config (that is the
case when they are initialized or freshly added). This is useful when
submodule URLs change upstream and you need to update your local
repositories accordingly.
View
@@ -2265,6 +2265,17 @@ <h3 id="_other">other</h3><div style="clear:left"></div>
</p>
</dd>
<dt class="hdlist1">
+<em>GIT_EDITOR</em>
+</dt>
+<dd>
+<p>
+ This environment variable overrides <tt>$EDITOR</tt> and <tt>$VISUAL</tt>.
+ It is used by several git comands when, on interactive mode,
+ an editor is to be launched. See also <a href="git-var.html">git-var(1)</a>
+ and the <tt>core.editor</tt> option in <a href="git-config.html">git-config(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
<em>GIT_SSH</em>
</dt>
<dd>
@@ -2406,7 +2417,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-02-20 02:24:57 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>
View
@@ -44,9 +44,10 @@ 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.9.4/git.html[documentation for release 1.7.9.4]
+* link:v1.7.9.5/git.html[documentation for release 1.7.9.5]
* release notes for
+ link:RelNotes/1.7.9.5.txt[1.7.9.5],
link:RelNotes/1.7.9.4.txt[1.7.9.4],
link:RelNotes/1.7.9.3.txt[1.7.9.3],
link:RelNotes/1.7.9.2.txt[1.7.9.2],
@@ -711,6 +712,12 @@ other
a pager. See also the `core.pager` option in
linkgit:git-config[1].
+'GIT_EDITOR'::
+ This environment variable overrides `$EDITOR` and `$VISUAL`.
+ It is used by several git comands 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].
+
'GIT_SSH'::
If this environment variable is set then 'git fetch'
and 'git push' will use this command instead
View
@@ -609,7 +609,7 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- Defines an url from where the submodule repository can be cloned.
+ Defines a URL from which the submodule repository can be cloned.
This may be either an absolute URL ready to be passed to
<a href="git-clone.html">git-clone(1)</a> or (if it begins with ./ or ../) a location
relative to the superproject&#8217;s origin repository.
@@ -683,7 +683,7 @@ <h2 id="_examples">EXAMPLES</h2>
</div></div>
<div class="paragraph"><p>This defines two submodules, <tt>libfoo</tt> and <tt>libbar</tt>. These are expected to
be checked out in the paths <em>include/foo</em> and <em>include/bar</em>, and for both
-submodules an url is specified which can be used for cloning the submodules.</p></div>
+submodules a URL is specified which can be used for cloning the submodules.</p></div>
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
@@ -697,7 +697,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>
View
@@ -28,7 +28,7 @@ submodule.<name>.path::
be unique within the .gitmodules file.
submodule.<name>.url::
- Defines an url from where the submodule repository can be cloned.
+ Defines a URL from which the submodule repository can be cloned.
This may be either an absolute URL ready to be passed to
linkgit:git-clone[1] or (if it begins with ./ or ../) a location
relative to the superproject's origin repository.
@@ -84,7 +84,7 @@ Consider the following .gitmodules file:
This defines two submodules, `libfoo` and `libbar`. These are expected to
be checked out in the paths 'include/foo' and 'include/bar', and for both
-submodules an url is specified which can be used for cloning the submodules.
+submodules a URL is specified which can be used for cloning the submodules.
SEE ALSO
--------
View
@@ -588,7 +588,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Gitweb provides a web interface to git repositories. It&#8217;s features include:</p></div>
+<div class="paragraph"><p>Gitweb provides a web interface to git repositories. Its features include:</p></div>
<div class="ulist"><ul>
<li>
<p>
@@ -660,7 +660,7 @@ <h3 id="_repositories">Repositories</h3><div style="clear:left"></div>
<tt>$projectroot</tt> directory for git repositories (for object databases to be
more exact; gitweb is not interested in a working area, and is best suited
to showing "bare" repositories).</p></div>
-<div class="paragraph"><p>The name of repository in gitweb is path to it&#8217;s <tt>$GIT_DIR</tt> (it&#8217;s object
+<div class="paragraph"><p>The name of the repository in gitweb is the path to its <tt>$GIT_DIR</tt> (its object
database) relative to <tt>$projectroot</tt>. Therefore the repository $repo can be
found at "$projectroot/$repo".</p></div>
<h3 id="_projects_list_file_format">Projects list file format</h3><div style="clear:left"></div>
@@ -1435,7 +1435,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-03-31 11:18:40 PDT
</div>
</div>
</body>
View
@@ -14,7 +14,7 @@ gitweb.
DESCRIPTION
-----------
-Gitweb provides a web interface to git repositories. It's features include:
+Gitweb provides a web interface to git repositories. Its features include:
* Viewing multiple Git repositories with common root.
* Browsing every revision of the repository.
@@ -60,7 +60,7 @@ to gitweb. The list of projects is generated by default by scanning the
more exact; gitweb is not interested in a working area, and is best suited
to showing "bare" repositories).
-The name of repository in gitweb is path to it's `$GIT_DIR` (it's object
+The name of the repository in gitweb is the path to its `$GIT_DIR` (its object
database) relative to `$projectroot`. Therefore the repository $repo can be
found at "$projectroot/$repo".
Oops, something went wrong.

0 comments on commit 0ff9816

Please sign in to comment.