| Index: man/html/git-retry.html
|
| diff --git a/man/html/git-mark-merge-base.html b/man/html/git-retry.html
|
| similarity index 89%
|
| copy from man/html/git-mark-merge-base.html
|
| copy to man/html/git-retry.html
|
| index 9e6f4e0c57c16527c323f3bcca525d2e07071093..06d126b6635e41bdc287da405062e5a0b4e5238b 100644
|
| --- a/man/html/git-mark-merge-base.html
|
| +++ b/man/html/git-retry.html
|
| @@ -4,7 +4,7 @@
|
| <head>
|
| <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
|
| <meta name="generator" content="AsciiDoc 8.6.9" />
|
| -<title>git-mark-merge-base(1)</title>
|
| +<title>git-retry(1)</title>
|
| <style type="text/css">
|
| /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|
|
|
| @@ -741,12 +741,12 @@ asciidoc.install();
|
| <body class="manpage">
|
| <div id="header">
|
| <h1>
|
| -git-mark-merge-base(1) Manual Page
|
| +git-retry(1) Manual Page
|
| </h1>
|
| <h2>NAME</h2>
|
| <div class="sectionbody">
|
| -<p>git-mark-merge-base -
|
| - Manually interact with depot_tools' merge-base markers.
|
| +<p>git-retry -
|
| + Bootstrap function to retry a git command.
|
| </p>
|
| </div>
|
| </div>
|
| @@ -755,9 +755,7 @@ git-mark-merge-base(1) Manual Page
|
| <h2 id="_synopsis">SYNOPSIS</h2>
|
| <div class="sectionbody">
|
| <div class="verseblock">
|
| -<pre class="content"><em>git mark-merge-base</em>
|
| -<em>git mark-merge-base</em> <commit hash>
|
| -<em>git mark-merge-base</em> [-d | --delete]</pre>
|
| +<pre class="content"><em>git retry</em> [-v] [-c COUNT] [-d DELAY] [-e] — <em><git_subcommand></em></pre>
|
| <div class="attribution">
|
| </div></div>
|
| </div>
|
| @@ -765,13 +763,12 @@ git-mark-merge-base(1) Manual Page
|
| <div class="sect1">
|
| <h2 id="_description">DESCRIPTION</h2>
|
| <div class="sectionbody">
|
| -<div class="paragraph"><p>Inspect, set or delete the current merge-base marker for the current branch.
|
| -This should not be needed, but is useful if things get into a snarled state.
|
| -Pass no arguments to view the current value. If you provide <commit hash>, then
|
| -<code>git mark-merge-base</code> will attempt to set that as the merge-base value.</p></div>
|
| -<div class="paragraph"><p>It is invalid to pick a commit which is not an ancestor of the current branch.</p></div>
|
| -<div class="paragraph"><p>See <a href="git-rebase-update.html">git-rebase-update(1)</a>'s description of the <code>branch.<name>.base</code>
|
| -configuration variable for more info on what the merge base markers are for.</p></div>
|
| +<div class="paragraph"><p><code>git retry</code> is a bootstrap that wraps a standard <code>git</code> command execution in
|
| +a fault-tolerant retry wrapper.</p></div>
|
| +<div class="paragraph"><p>If a retry succeeds, the return code of the successful attempt is returned.
|
| +Otherwise, the return code of the last failed attempt is returned.</p></div>
|
| +<div class="paragraph"><p>The wrapper is aware of <code>git</code>-specific failure conditions and will only consider
|
| +retrying if a given failure can be linked to such a condition.</p></div>
|
| </div>
|
| </div>
|
| <div class="sect1">
|
| @@ -779,32 +776,58 @@ configuration variable for more info on what the merge base markers are for.</p>
|
| <div class="sectionbody">
|
| <div class="dlist"><dl>
|
| <dt class="hdlist1">
|
| --d
|
| +<git_subcommand>
|
| </dt>
|
| +<dd>
|
| +<p>
|
| + The <code>git</code> command to retry. This should omit the actual <code>git</code> command (e.g.,
|
| + to retry <code>git clone</code>, use <code>git retry clone</code>).
|
| +</p>
|
| +</dd>
|
| +<dt class="hdlist1">
|
| +-v, --verbose
|
| +</dt>
|
| +<dd>
|
| +<p>
|
| + Increases logging verbosity. By default, no additional logging is generated
|
| + by the <code>git retry</code> command. This can be specified multiple times.
|
| +</p>
|
| +</dd>
|
| +<dt class="hdlist1">
|
| +-c, --retry-count <em>count</em>
|
| +</dt>
|
| +<dd>
|
| +<p>
|
| + Specify the number of retries that should be performed before giving up.
|
| +</p>
|
| +</dd>
|
| <dt class="hdlist1">
|
| ---delete
|
| +-d, --delay <em>seconds</em>
|
| </dt>
|
| <dd>
|
| <p>
|
| - Delete the merge-base marker for the current branch.
|
| + If specified, the time delta to wait in between retry attempts. By default,
|
| + retries will happen immediately after failures. This can be used to introduce
|
| + a delay.
|
| </p>
|
| </dd>
|
| <dt class="hdlist1">
|
| -<commit hash>
|
| +-e, --delay-exponential
|
| </dt>
|
| <dd>
|
| <p>
|
| - The new value to set for the current branch’s merge-base marker.
|
| + If specified, the retry delay will double with each retry. Note that if no
|
| + delay is specified, this will have no effect.
|
| </p>
|
| </dd>
|
| </dl></div>
|
| </div>
|
| </div>
|
| <div class="sect1">
|
| -<h2 id="_see_also">SEE ALSO</h2>
|
| +<h2 id="_exit_status">EXIT STATUS</h2>
|
| <div class="sectionbody">
|
| -<div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)</a>, <a href="git-reparent-branch.html">git-reparent-branch(1)</a>,
|
| -<a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a></p></div>
|
| +<div class="paragraph"><p>Upon success, <code>git retry</code> will exit with the successful exit code of <strong>0</strong>. On
|
| +failure, it will exit with the exit code of the last failed attempt.</p></div>
|
| </div>
|
| </div>
|
| <div class="sect1">
|
| @@ -819,7 +842,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
| <div id="footnotes"><hr /></div>
|
| <div id="footer">
|
| <div id="footer-text">
|
| -Last updated 2014-04-10 14:23:11 PDT
|
| +Last updated 2014-07-17 15:05:45 PDT
|
| </div>
|
| </div>
|
| </body>
|
|
|
Chromium Code Reviews
Issue 401673003:
Added 'git-retry' bootstrap (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools