Permalink
Browse files

Autogenerated HTML docs for v1.7.12-176-g3fc0e

  • Loading branch information...
1 parent 5385026 commit f335393cb267ed983d1b9d6574b95d6f26bd5a85 @gitster committed Sep 4, 2012
Showing with 123 additions and 18 deletions.
  1. +45 −0 RelNotes/1.8.0.txt
  2. +11 −1 git-cherry-pick.html
  3. +5 −0 git-cherry-pick.txt
  4. +5 −9 git-config.html
  5. +4 −4 git-config.txt
  6. +21 −1 git-daemon.html
  7. +16 −0 git-daemon.txt
  8. +8 −2 git-submodule.html
  9. +8 −1 git-submodule.txt
View
@@ -24,6 +24,13 @@ UI, Workflows & Features
* A credential helper for Win32 to allow access to the keychain of
the logged-in user has been added.
+ * "git cherry-pick" learned the "--allow-empty-message" option to
+ allow it to replay a commit without any log message.
+
+ * "git daemon" learned the "--access-hook" option to allow an
+ external command to decline service based on the client address,
+ repository path, etc.
+
* "git difftool --dir-diff" learned to use symbolic links to prepare
temporary copy of the working tree when available.
@@ -43,6 +50,13 @@ Performance, Internal Implementation, etc. (please report possible regressions)
for materials meant to be examples that are better typeset in
monospace.
+ * Compatibility wrapper to learn the maximum number of file
+ descriptors we can open around sysconf(_SC_OPEN_MAX) and
+ getrlimit(RLIMIT_NO_FILE) has been introduced for portability.
+
+ * Compatibility wrapper around some mkdir(2) implementations that
+ reject parameter with trailing slash has been introduced.
+
Also contains minor documentation updates and code clean-ups.
@@ -53,6 +67,37 @@ Unless otherwise noted, all the fixes since v1.7.12 in the
maintenance track are contained in this release (see release notes
to them for details).
+ * The exit status code from "git config" was way overspecified while
+ being incorrect. The implementation has been updated to give the
+ documented status for a case that was documented, and introduce a
+ new code for "all other errors".
+ (merge 9409c7a jc/maint-config-exit-status later to maint).
+
+ * "git foo" errored out with "Not a directory" when the user had a
+ non-directory on $PATH, and worse yet it masked an alias "foo" from
+ running. (merge a785508 jc/maint-sane-execvp-notdir later to
+ maint).
+
+ * The interactive prompt "git send-email" gives was error prone. It
+ asked "What e-mail address do you want to use?" with the address it
+ guessed (correctly) the user would want to use in its prompt,
+ tempting the user to say "y". But the response was taken as "No,
+ please use 'y' as the e-mail address instead", which is most
+ certainly not what the user meant.
+ (merge 51bbccf jc/send-email-reconfirm later to maint).
+
+ * "git stash apply/pop" did not trigger "rerere" upon conflicts
+ unlike other mergy operations.
+ (merge 743bf6d ph/stash-rerere later to maint).
+
+ * "git submodule update -f" did not update paths in the working tree
+ that has local changes.
+ (merge 01d4721 sz/submodule-force-update later to maint).
+
+ * We used curl_easy_strerror() without checking version of cURL,
+ breaking the build for versions before curl 7.12.0.
+ (merge 4246b0b js/no-curl-easy-strerror-on-old-curl later to maint).
+
* Code to work around MacOS X UTF-8 gotcha has been cleaned up.
(merge 9a27f96 rr/precompose-utf8-cleanup later to maint).
View
@@ -767,6 +767,16 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--allow-empty-message
+</dt>
+<dd>
+<p>
+ By default, cherry-picking a commit with an empty message will fail.
+ This option overrides that behaviour, allowing commits with empty
+ messages to be cherry picked.
+</p>
+</dd>
+<dt class="hdlist1">
--keep-redundant-commits
</dt>
<dd>
@@ -970,7 +980,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-06-25 13:00:39 PDT
+Last updated 2012-09-04 16:16:22 PDT
</div>
</div>
</body>
View
@@ -118,6 +118,11 @@ effect to your index in a row.
previous commit are dropped. To force the inclusion of those commits
use `--keep-redundant-commits`.
+--allow-empty-message::
+ By default, cherry-picking a commit with an empty message will fail.
+ This option overrides that behaviour, allowing commits with empty
+ messages to be cherry picked.
+
--keep-redundant-commits::
If a commit being cherry picked duplicates a commit already in the
current history, it will become empty. By default these
View
@@ -625,7 +625,8 @@ <h2 id="_description">DESCRIPTION</h2>
configuration file by default, and options <em>--system</em>, <em>--global</em>,
<em>--file &lt;filename&gt;</em> can be used to tell the command to write to
that location (you can say <em>--local</em> but that is the default).</p></div>
-<div class="paragraph"><p>This command will fail (with exit code ret) if:</p></div>
+<div class="paragraph"><p>This command will fail with non-zero status upon error. Some exit
+codes are:</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
@@ -654,17 +655,12 @@ <h2 id="_description">DESCRIPTION</h2>
</li>
<li>
<p>
-you try to unset/set an option for which multiple lines match (ret=5),
+you try to unset/set an option for which multiple lines match (ret=5), or
</p>
</li>
<li>
<p>
-you try to use an invalid regexp (ret=6), or
-</p>
-</li>
-<li>
-<p>
-you use <em>--global</em> option without $HOME being properly set (ret=128).
+you try to use an invalid regexp (ret=6).
</p>
</li>
</ol></div>
@@ -5080,7 +5076,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-08-29 16:03:20 PDT
+Last updated 2012-09-04 16:16:22 PDT
</div>
</div>
</body>
View
@@ -54,16 +54,16 @@ configuration file by default, and options '--system', '--global',
'--file <filename>' can be used to tell the command to write to
that location (you can say '--local' but that is the default).
-This command will fail (with exit code ret) if:
+This command will fail with non-zero status upon error. Some exit
+codes are:
. The config file is invalid (ret=3),
. can not write to the config file (ret=4),
. no section or name was provided (ret=2),
. the section or key is invalid (ret=1),
. you try to unset an option which does not exist (ret=5),
-. you try to unset/set an option for which multiple lines match (ret=5),
-. you try to use an invalid regexp (ret=6), or
-. you use '--global' option without $HOME being properly set (ret=128).
+. you try to unset/set an option for which multiple lines match (ret=5), or
+. you try to use an invalid regexp (ret=6).
On success, the command returns the exit code 0.
View
@@ -591,6 +591,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
[--reuseaddr] [--detach] [--pid-file=&lt;file&gt;]
[--enable=&lt;service&gt;] [--disable=&lt;service&gt;]
[--allow-override=&lt;service&gt;] [--forbid-override=&lt;service&gt;]
+ [--access-hook=&lt;path&gt;]
[--inetd | [--listen=&lt;host_or_ipaddr&gt;] [--port=&lt;n&gt;] [--user=&lt;user&gt; [--group=&lt;group&gt;]]
[&lt;directory&gt;&#8230;]</div>
<div class="verseblock-attribution">
@@ -860,6 +861,25 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--access-hook=&lt;path&gt;
+</dt>
+<dd>
+<p>
+ Every time a client connects, first run an external command
+ specified by the &lt;path&gt; with service name (e.g. "upload-pack"),
+ path to the repository, hostname (%H), canonical hostname
+ (%CH), ip address (%IP), and tcp port (%P) as its command line
+ arguments. The external command can decide to decline the
+ service by exiting with a non-zero status (or to allow it by
+ exiting with a zero status). It can also look at the $REMOTE_ADDR
+ and $REMOTE_PORT environment variables to learn about the
+ requestor when making this decision.
+</p>
+<div class="paragraph"><p>The external command can optionally write a single line to its
+standard output to be sent to the requestor as an error message when
+it declines the service.</p></div>
+</dd>
+<dt class="hdlist1">
&lt;directory&gt;
</dt>
<dd>
@@ -1029,7 +1049,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-07-22 14:08:46 PDT
+Last updated 2012-09-04 16:16:22 PDT
</div>
</div>
</body>
View
@@ -16,6 +16,7 @@ SYNOPSIS
[--reuseaddr] [--detach] [--pid-file=<file>]
[--enable=<service>] [--disable=<service>]
[--allow-override=<service>] [--forbid-override=<service>]
+ [--access-hook=<path>]
[--inetd | [--listen=<host_or_ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]
[<directory>...]
@@ -171,6 +172,21 @@ the facility of inet daemon to achieve the same before spawning
errors are not enabled, all errors report "access denied" to the
client. The default is --no-informative-errors.
+--access-hook=<path>::
+ Every time a client connects, first run an external command
+ specified by the <path> with service name (e.g. "upload-pack"),
+ path to the repository, hostname (%H), canonical hostname
+ (%CH), ip address (%IP), and tcp port (%P) as its command line
+ arguments. The external command can decide to decline the
+ service by exiting with a non-zero status (or to allow it by
+ exiting with a zero status). It can also look at the $REMOTE_ADDR
+ and $REMOTE_PORT environment variables to learn about the
+ requestor when making this decision.
++
+The external command can optionally write a single line to its
+standard output to be sent to the requestor as an error message when
+it declines the service.
+
<directory>::
A directory to add to the whitelist of allowed directories. Unless
--strict-paths is specified this will also include subdirectories
View
@@ -733,6 +733,10 @@ <h2 id="_commands">COMMANDS</h2>
submodule with the <tt>--init</tt> option.</p></div>
<div class="paragraph"><p>If <tt>--recursive</tt> is specified, this command will recurse into the
registered submodules, and update any nested submodules within.</p></div>
+<div class="paragraph"><p>If <tt>--force</tt> is specified, the submodule will be checked out (using
+<tt>git checkout --force</tt> if appropriate), even if the commit specified in the
+index of the containing repository already matches the commit checked out in
+the submodule.</p></div>
</dd>
<dt class="hdlist1">
summary
@@ -829,7 +833,9 @@ <h2 id="_options">OPTIONS</h2>
This option is only valid for add and update commands.
When running add, allow adding an otherwise ignored submodule path.
When running update, throw away local changes in submodules when
- switching to a different commit.
+ switching to a different commit; and always run a checkout operation
+ in the submodule, even if the commit listed in the index of the
+ containing repository matches the commit checked out in the submodule.
</p>
</dd>
<dt class="hdlist1">
@@ -969,7 +975,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-06-22 15:42:03 PDT
+Last updated 2012-09-04 16:16:22 PDT
</div>
</div>
</body>
View
@@ -149,6 +149,11 @@ submodule with the `--init` option.
+
If `--recursive` is specified, this command will recurse into the
registered submodules, and update any nested submodules within.
++
+If `--force` is specified, the submodule will be checked out (using
+`git checkout --force` if appropriate), even if the commit specified in the
+index of the containing repository already matches the commit checked out in
+the submodule.
summary::
Show commit summary between the given commit (defaults to HEAD) and
@@ -210,7 +215,9 @@ OPTIONS
This option is only valid for add and update commands.
When running add, allow adding an otherwise ignored submodule path.
When running update, throw away local changes in submodules when
- switching to a different commit.
+ switching to a different commit; and always run a checkout operation
+ in the submodule, even if the commit listed in the index of the
+ containing repository matches the commit checked out in the submodule.
--cached::
This option is only valid for status and summary commands. These

0 comments on commit f335393

Please sign in to comment.