Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Autogenerated HTML docs for v1.8.5.2-227-g53f347

  • Loading branch information...
commit b1acf0200aa1efd66d18ed4e108792e1068464a9 1 parent cf77b04
@gitster authored
View
5 git-pack-objects.html
@@ -793,8 +793,7 @@ <h2 id="_options">OPTIONS</h2>
&lt;base-name&gt; to determine the name of the created file.
When this option is used, the two files are written in
&lt;base-name&gt;-&lt;SHA-1&gt;.{pack,idx} files. &lt;SHA-1&gt; is a hash
- of the sorted object names to make the resulting filename
- based on the pack content, and written to the standard
+ based on the pack content and is written to the standard
output of the command.
</p>
</dd>
@@ -1108,7 +1107,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-12-27 16:32:55 PST
</div>
</div>
</body>
View
3  git-pack-objects.txt
@@ -51,8 +51,7 @@ base-name::
<base-name> to determine the name of the created file.
When this option is used, the two files are written in
<base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash
- of the sorted object names to make the resulting filename
- based on the pack content, and written to the standard
+ based on the pack content and is written to the standard
output of the command.
--stdout::
View
11 git-push.html
@@ -803,8 +803,13 @@ <h2 id="_options_a_id_options_a">OPTIONS<a id="OPTIONS"></a></h2>
<code>HEAD</code> (see <a href="gitrevisions.html">gitrevisions(7)</a>).</p></div>
<div class="paragraph"><p>The &lt;dst&gt; tells which ref on the remote side is updated with this
push. Arbitrary expressions cannot be used here, an actual ref must
-be named. If <code>:</code>&lt;dst&gt; is omitted, the same ref as &lt;src&gt; will be
-updated.</p></div>
+be named.
+If <code>git push [&lt;repository&gt;]</code> without any <code>&lt;refspec&gt;</code> argument is set to
+update some ref at the destination with <code>&lt;src&gt;</code> with
+<code>remote.&lt;repository&gt;.push</code> configuration variable, <code>:&lt;dst&gt;</code> part can
+be omitted---such a push will update a ref that <code>&lt;src&gt;</code> normally updates
+without any <code>&lt;refspec&gt;</code> on the command line. Otherwise, missing
+<code>:&lt;dst&gt;</code> means to update the same ref as the <code>&lt;src&gt;</code>.</p></div>
<div class="paragraph"><p>The object referenced by &lt;src&gt; is used to update the &lt;dst&gt; reference
on the remote side. By default this is only allowed if &lt;dst&gt; is not
a tag (annotated or lightweight), and then only if it can fast-forward
@@ -1722,7 +1727,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-17 14:33:14 PDT
+Last updated 2013-12-27 16:32:55 PST
</div>
</div>
</body>
View
9 git-push.txt
@@ -56,8 +56,13 @@ it can be any arbitrary "SHA-1 expression", such as `master~4` or
+
The <dst> tells which ref on the remote side is updated with this
push. Arbitrary expressions cannot be used here, an actual ref must
-be named. If `:`<dst> is omitted, the same ref as <src> will be
-updated.
+be named.
+If `git push [<repository>]` without any `<refspec>` argument is set to
+update some ref at the destination with `<src>` with
+`remote.<repository>.push` configuration variable, `:<dst>` part can
+be omitted---such a push will update a ref that `<src>` normally updates
+without any `<refspec>` on the command line. Otherwise, missing
+`:<dst>` means to update the same ref as the `<src>`.
+
The object referenced by <src> is used to update the <dst> reference
on the remote side. By default this is only allowed if <dst> is not
View
18 git-rebase.html
@@ -1175,6 +1175,22 @@ <h2 id="_options">OPTIONS</h2>
<a href="howto/revert-a-faulty-merge.html">revert-a-faulty-merge How-To</a> for details).</p></div>
</dd>
<dt class="hdlist1">
+--fork-point
+</dt>
+<dt class="hdlist1">
+--no-fork-point
+</dt>
+<dd>
+<p>
+ Use <em>git merge-base --fork-point</em> to find a better common ancestor
+ between <code>upstream</code> and <code>branch</code> when calculating which commits have
+ have been introduced by <code>branch</code> (see <a href="git-merge-base.html">git-merge-base(1)</a>).
+</p>
+<div class="paragraph"><p>If no non-option arguments are given on the command line, then the default is
+<code>--fork-point @{u}</code> otherwise the <code>upstream</code> argument is interpreted literally
+unless the <code>--fork-point</code> option is specified.</p></div>
+</dd>
+<dt class="hdlist1">
--ignore-whitespace
</dt>
<dt class="hdlist1">
@@ -1941,7 +1957,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-17 14:33:14 PDT
+Last updated 2013-12-27 16:32:55 PST
</div>
</div>
</body>
View
10 git-rebase.txt
@@ -324,6 +324,16 @@ fresh commits so it can be remerged successfully without needing to "revert
the reversion" (see the
link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details).
+--fork-point::
+--no-fork-point::
+ Use 'git merge-base --fork-point' to find a better common ancestor
+ between `upstream` and `branch` when calculating which commits have
+ have been introduced by `branch` (see linkgit:git-merge-base[1]).
++
+If no non-option arguments are given on the command line, then the default is
+`--fork-point @{u}` otherwise the `upstream` argument is interpreted literally
+unless the `--fork-point` option is specified.
+
--ignore-whitespace::
--whitespace=<option>::
These flag are passed to the 'git apply' program
View
20 git.html
@@ -2527,6 +2527,24 @@ <h3 id="_git_diffs">Git Diffs</h3>
temporary file --- it is removed when <em>GIT_EXTERNAL_DIFF</em> exits.</p></div>
<div class="paragraph"><p>For a path that is unmerged, <em>GIT_EXTERNAL_DIFF</em> is called with 1
parameter, &lt;path&gt;.</p></div>
+<div class="paragraph"><p>For each path <em>GIT_EXTERNAL_DIFF</em> is called, two environment variables,
+<em>GIT_DIFF_PATH_COUNTER</em> and <em>GIT_DIFF_PATH_TOTAL</em> are set.</p></div>
+</dd>
+<dt class="hdlist1">
+<em>GIT_DIFF_PATH_COUNTER</em>
+</dt>
+<dd>
+<p>
+ A 1-based counter incremented by one for every path.
+</p>
+</dd>
+<dt class="hdlist1">
+<em>GIT_DIFF_PATH_TOTAL</em>
+</dt>
+<dd>
+<p>
+ The total number of paths.
+</p>
</dd>
</dl></div>
</div>
@@ -2834,7 +2852,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-12-03 14:06:33 PST
+Last updated 2013-12-27 16:32:55 PST
</div>
</div>
</body>
View
9 git.txt
@@ -807,6 +807,15 @@ temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
+
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
parameter, <path>.
++
+For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables,
+'GIT_DIFF_PATH_COUNTER' and 'GIT_DIFF_PATH_TOTAL' are set.
+
+'GIT_DIFF_PATH_COUNTER'::
+ A 1-based counter incremented by one for every path.
+
+'GIT_DIFF_PATH_TOTAL'::
+ The total number of paths.
other
~~~~~
Please sign in to comment.
Something went wrong with that request. Please try again.