Permalink
Browse files

Autogenerated HTML docs for v1.7.10-227-gd1ca7

  • Loading branch information...
1 parent d1ace0c commit 0c1b64ec7505c3f5b7ca8e4ccc69a577adb0b814 Junio C Hamano committed Apr 20, 2012
Showing with 87 additions and 9 deletions.
  1. +27 −1 RelNotes/1.7.11.txt
  2. +17 −2 config.txt
  3. +5 −2 git-am.html
  4. +2 −1 git-am.txt
  5. +36 −3 git-config.html
View
@@ -16,6 +16,20 @@ UI, Workflows & Features
variables with REMOTE_USER and REMOTE_ADDR, but these variables are
now preserved when set.
+ * "git am" learned the "--include" option, which is an opposite of
+ existing the "--exclude" option.
+
+ * When "git am -3" needs to fall back to an application to a
+ synthesized preimage followed by a 3-way merge, the paths that
+ needed such treatment are now reported to the end user, so that the
+ result in them can be eyeballed with extra care.
+
+ * The "fmt-merge-msg" command learns to list the primary contributors
+ involved in the side topic you are merging.
+
+ * The cases "git push" fails due to non-ff can be broken into three
+ categories; each case is given a separate advise message.
+
* A 'snapshot' request to "gitweb" honors If-Modified-Since: header,
based on the commit date.
@@ -35,7 +49,7 @@ Internal Implementation (please report possible regressions)
* Because "sh" on the user's PATH may be utterly broken on some
systems, run-command API now uses SHELL_PATH, not /bin/sh, when
- spawning an external command.
+ spawning an external command (not applicable to Windows port).
Also contains minor documentation updates and code clean-ups.
@@ -47,6 +61,18 @@ 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).
+ * When PATH contains an unreadable directory, alias expansion code
+ did not kick in, and failed with an error that said "git-subcmd"
+ was not found.
+ (merge 38f865c jk/run-command-eacces later to maint).
+
+ * The 'push to upstream' implementation was broken in some corner
+ cases. "git push $there" without refspec, when the current branch
+ is set to push to a remote different from $there, used to push to
+ $there using the upstream information to a remote unreleated to
+ $there.
+ (merge 135dade jc/push-upstream-sanity later to maint).
+
* "git clean -d -f" (not "-d -f -f") is supposed to protect nested
working trees of independent git repositories that exist in the
current project working tree from getting removed, but the
View
@@ -138,8 +138,23 @@ advice.*::
+
--
pushNonFastForward::
- Advice shown when linkgit:git-push[1] refuses
- non-fast-forward refs.
+ Set this variable to 'false' if you want to disable
+ 'pushNonFFCurrent', 'pushNonFFDefault', and
+ 'pushNonFFMatching' simultaneously.
+ pushNonFFCurrent::
+ Advice shown when linkgit:git-push[1] fails due to a
+ non-fast-forward update to the current branch.
+ pushNonFFDefault::
+ Advice to set 'push.default' to 'upstream' or 'current'
+ when you ran linkgit:git-push[1] and pushed 'matching
+ refs' by default (i.e. you did not provide an explicit
+ refspec, and no 'push.default' configuration was set)
+ and it resulted in a non-fast-forward error.
+ pushNonFFMatching::
+ Advice shown when you ran linkgit:git-push[1] and pushed
+ 'matching refs' explicitly (i.e. you used ':', or
+ specified a refspec that isn't your current branch) and
+ it resulted in a non-fast-forward error.
statusHints::
Directions on how to stage/unstage/add shown in the
output of linkgit:git-status[1] and the template shown
View
@@ -587,7 +587,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
[--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
- [--exclude=&lt;path&gt;] [--reject] [-q | --quiet]
+ [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
[--scissors | --no-scissors]
[(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;]
<em>git am</em> (--continue | --skip | --abort)</div>
@@ -754,6 +754,9 @@ <h2 id="_options">OPTIONS</h2>
--exclude=&lt;path&gt;
</dt>
<dt class="hdlist1">
+--include=&lt;path&gt;
+</dt>
+<dt class="hdlist1">
--reject
</dt>
<dd>
@@ -923,7 +926,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-01-29 14:19:30 PDT
+Last updated 2012-04-20 16:50:33 PDT
</div>
</div>
</body>
View
@@ -13,7 +13,7 @@ SYNOPSIS
[--3way] [--interactive] [--committer-date-is-author-date]
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
- [--exclude=<path>] [--reject] [-q | --quiet]
+ [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--scissors | --no-scissors]
[(<mbox> | <Maildir>)...]
'git am' (--continue | --skip | --abort)
@@ -92,6 +92,7 @@ default. You can use `--no-utf8` to override this.
-p<n>::
--directory=<dir>::
--exclude=<path>::
+--include=<path>::
--reject::
These flags are passed to the 'git apply' (see linkgit:git-apply[1])
program that applies
View
@@ -1205,8 +1205,41 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
</dt>
<dd>
<p>
- Advice shown when <a href="git-push.html">git-push(1)</a> refuses
- non-fast-forward refs.
+ Set this variable to <em>false</em> if you want to disable
+ <em>pushNonFFCurrent</em>, <em>pushNonFFDefault</em>, and
+ <em>pushNonFFMatching</em> simultaneously.
+</p>
+</dd>
+<dt class="hdlist1">
+pushNonFFCurrent
+</dt>
+<dd>
+<p>
+ Advice shown when <a href="git-push.html">git-push(1)</a> fails due to a
+ non-fast-forward update to the current branch.
+</p>
+</dd>
+<dt class="hdlist1">
+pushNonFFDefault
+</dt>
+<dd>
+<p>
+ Advice to set <em>push.default</em> to <em>upstream</em> or <em>current</em>
+ when you ran <a href="git-push.html">git-push(1)</a> and pushed <em>matching
+ refs</em> by default (i.e. you did not provide an explicit
+ refspec, and no <em>push.default</em> configuration was set)
+ and it resulted in a non-fast-forward error.
+</p>
+</dd>
+<dt class="hdlist1">
+pushNonFFMatching
+</dt>
+<dd>
+<p>
+ Advice shown when you ran <a href="git-push.html">git-push(1)</a> and pushed
+ <em>matching refs</em> explicitly (i.e. you used <em>:</em>, or
+ specified a refspec that isn&#8217;t your current branch) and
+ it resulted in a non-fast-forward error.
</p>
</dd>
<dt class="hdlist1">
@@ -4867,7 +4900,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-03-02 11:52:01 PDT
+Last updated 2012-04-20 12:42:45 PDT
</div>
</div>
</body>

0 comments on commit 0c1b64e

Please sign in to comment.