Permalink
Browse files

Autogenerated HTML docs for v1.8.4.1-559-gdb9bdf

  • Loading branch information...
1 parent f2d4a13 commit aef76445eb91513ca7684bdd5a80ecfef32ae40e @gitster committed Oct 18, 2013
Showing with 62 additions and 11 deletions.
  1. +7 −0 RelNotes/1.8.5.txt
  2. +13 −2 git-merge.html
  3. +5 −1 git-merge.txt
  4. +6 −4 git-sh-setup.html
  5. +5 −3 git-sh-setup.txt
  6. +16 −1 git.html
  7. +10 −0 git.txt
View
@@ -201,6 +201,8 @@ UI, Workflows & Features
Performance, Internal Implementation, etc.
+ * "git repack" is now written in C.
+
* Build procedure for MSVC has been updated.
* If a build-time fallback is set to "cat" instead of "less", we
@@ -236,6 +238,11 @@ Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
track are contained in this release (see release notes to them for
details).
+ * "git clone" gave some progress messages to the standard output, not
+ to the standard error, and did not allow suppressing them with the
+ --no-progress option.
+ (merge 643f918 jk/clone-progress-to-stderr later to maint).
+
* "format-patch --from=<whom>" forgot to omit unnecessary in-body
from line, i.e. when <whom> is the same as the real author.
(merge 662cc30 jk/format-patch-from later to maint).
View
@@ -747,7 +747,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
- [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;]
+ [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;] [-S[&lt;keyid&gt;]]
[--[no-]rerere-autoupdate] [-m &lt;msg&gt;] [&lt;commit&gt;&#8230;]
<em>git merge</em> &lt;msg&gt; HEAD &lt;commit&gt;&#8230;
<em>git merge</em> --abort</pre>
@@ -1011,6 +1011,17 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+-S[&lt;keyid&gt;]
+</dt>
+<dt class="hdlist1">
+--gpg-sign[=&lt;keyid&gt;]
+</dt>
+<dd>
+<p>
+ GPG-sign the resulting merge commit.
+</p>
+</dd>
+<dt class="hdlist1">
-m &lt;msg&gt;
</dt>
<dd>
@@ -1805,7 +1816,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-05 16:41:39 PDT
+Last updated 2013-10-18 15:11:10 PDT
</div>
</div>
</body>
View
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
- [-s <strategy>] [-X <strategy-option>]
+ [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
'git merge' <msg> HEAD <commit>...
'git merge' --abort
@@ -65,6 +65,10 @@ OPTIONS
-------
include::merge-options.txt[]
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+ GPG-sign the resulting merge commit.
+
-m <msg>::
Set the commit message to be used for the merge commit (in
case one is created).
View
@@ -795,9 +795,11 @@ <h2 id="_functions">FUNCTIONS</h2>
</dt>
<dd>
<p>
- set the message that will be recorded to describe the
- end-user action in the reflog, when the script updates a
- ref.
+ Set GIT_REFLOG_ACTION environment to a given string (typically
+ the name of the program) unless it is already set. Whenever
+ the script runs a <code>git</code> command that updates refs, a reflog
+ entry is created using the value of this string to leave the
+ record of what command updated the ref.
</p>
</dd>
<dt class="hdlist1">
@@ -896,7 +898,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-10-18 15:11:10 PDT
</div>
</div>
</body>
View
@@ -41,9 +41,11 @@ usage::
die with the usage message.
set_reflog_action::
- set the message that will be recorded to describe the
- end-user action in the reflog, when the script updates a
- ref.
+ Set GIT_REFLOG_ACTION environment to a given string (typically
+ the name of the program) unless it is already set. Whenever
+ the script runs a `git` command that updates refs, a reflog
+ entry is created using the value of this string to leave the
+ record of what command updated the ref.
git_editor::
runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or
View
@@ -2743,6 +2743,21 @@ <h3 id="_other">other</h3>
pathspecs as case-insensitive.
</p>
</dd>
+<dt class="hdlist1">
+<em>GIT_REFLOG_ACTION</em>
+</dt>
+<dd>
+<p>
+ When a ref is updated, reflog entries are created to keep
+ track of the reason why the ref was updated (which is
+ typically the name of the high-level command that updated
+ the ref), in addition to the old and new values of the ref.
+ A scripted Porcelain command can use set_reflog_action
+ helper function in <code>git-sh-setup</code> to set its name to this
+ variable when it is invoked as the top level command by the
+ end user, to be recorded in the body of the reflog.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -2851,7 +2866,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-10-15 18:18:37 PDT
+Last updated 2013-10-18 15:11:10 PDT
</div>
</div>
</body>
View
10 git.txt
@@ -909,6 +909,16 @@ GIT_ICASE_PATHSPECS::
Setting this variable to `1` will cause Git to treat all
pathspecs as case-insensitive.
+'GIT_REFLOG_ACTION'::
+ When a ref is updated, reflog entries are created to keep
+ track of the reason why the ref was updated (which is
+ typically the name of the high-level command that updated
+ the ref), in addition to the old and new values of the ref.
+ A scripted Porcelain command can use set_reflog_action
+ helper function in `git-sh-setup` to set its name to this
+ variable when it is invoked as the top level command by the
+ end user, to be recorded in the body of the reflog.
+
Discussion[[Discussion]]
------------------------

0 comments on commit aef7644

Please sign in to comment.