man/html/git-retry.html - Issue 401673003: Added 'git-retry' bootstrap

Unified Diff: man/html/git-retry.html

Issue 401673003: Added 'git-retry' bootstrap (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: More updates. Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: man/html/git-retry.html

diff --git a/man/html/git-reparent-branch.html b/man/html/git-retry.html

similarity index 87%

copy from man/html/git-reparent-branch.html

copy to man/html/git-retry.html

index ba8a0fc78b8637fab9859e589f3ff7e49a7a66b7..1feaaae2edbc08597f6207f2d2980d8127f96361 100644

--- a/man/html/git-reparent-branch.html

+++ b/man/html/git-retry.html

@@ -4,7 +4,7 @@

<head>

-<title>git-reparent-branch(1)</title>

+<title>git-retry(1)</title>

/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

@@ -741,12 +741,12 @@ asciidoc.install();

<h1>

-git-reparent-branch(1) Manual Page

+git-retry(1) Manual Page

</h1>

-<p>git-reparent-branch -

- Alter the parentage (upstream) for the current branch.

+<p>git-retry -

+ Bootstrap function to retry a git command.

</p>

</div>

@@ -755,9 +755,7 @@ git-reparent-branch(1) Manual Page

<h2 id="_synopsis">SYNOPSIS</h2>

-<pre class="content"><em>git reparent-branch</em> <new_parent>

-<em>git reparent-branch</em> --lkgr

-<em>git reparent-branch</em> --root</pre>

+<pre class="content"><em>git retry</em> [-v] [-c COUNT] [-d DELAY] [-e] — <em><git_subcommand></em></pre>

</div></div>

</div>

@@ -765,15 +763,12 @@ git-reparent-branch(1) Manual Page

<h2 id="_description">DESCRIPTION</h2>

-<div class="paragraph"><p>Change the <em>upstream</em> of the current branch, and then run

-<a href="git-rebase-update.html">git-rebase-update(1)</a> to move the commits in the current branch, as well

-as the commits in all descendant branches, onto the new parent.</p></div>

-<div class="paragraph"><p><code><new_parent></code> may be either a local branch, remote branch, OR a tag (such as

-<code>lkgr</code>).</p></div>

-<div class="paragraph"><p>This is particularly useful to reparent an independent CL to become dependent on

-another CL, or vice versa. This could happen if you started both on the

-assumption that they were independent, but later realized that this was not the

-case.</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>

@@ -781,51 +776,67 @@ case.</p></div>

-<new_parent>

+<git_subcommand>

</dt>

<dd>

<p>

- The new parent to set as the upstream for this branch. May be a branch ref or

- a tag.

+ 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>

---lkgr

+-v, --verbose

</dt>

<dd>

<p>

- Reparent to track lkgr.

+ 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>

---root

+-c, --retry-count <em>count</em>

</dt>

<dd>

<p>

- Reparent to track the <em>root</em> branch. Defaults to <em>origin/master</em>. See

- <a href="git-new-branch.html">git-new-branch(1)</a>'s CONFIGURATION VARIABLES section..

+ Specify the number of retries that should be performed before giving up. The

+ default retry count is <strong>5</strong>.

</p>

</dd>

-</dl></div>

-</div>

-<div class="sect1">

-<h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>

-<div class="sectionbody">

-<div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>

-file.</p></div>

-<div class="listingblock">

+<dt class="hdlist1">

+-d, --delay <em>seconds</em>

+</dt>

+<dd>

+<p>

+ Floating-point value that specifies the amount of time (in seconds) to wait

+ after a failure. This can be zero to specify no delay. The default delay is

+ <strong>3 seconds</strong>.

+</p>

+</dd>

+<dt class="hdlist1">

+-D, --delay-factor

+</dt>

+<dd>

+<p>

+ The exponential factor to apply to the delay. By default this is <strong>2</strong>.

+ For a given retry round <strong>n</strong>, the delay for that round will be

+ <strong>(<delay-factor>^(n-1) * delay)</strong>. If no delay is specified, this will have

+ no effect.

+ If the delay factor is <strong>0</strong>, the delay will increase linearly (for a given

+ retry round <strong>n</strong>, the delay will be <strong>(n * delay)</strong>).

+</p>

+<div class="literalblock">

-<pre><code>[alias]

- git rp = reparent-branch</code></pre>

+<pre><code>(Note that a delay factor of *1* will result in a constant delay.)</code></pre>

</div></div>

+</dd>

+</dl></div>

</div>

-<h2 id="_see_also">SEE ALSO</h2>

+<h2 id="_exit_status">EXIT STATUS</h2>

-<div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)</a>, <a href="git-rename-branch.html">git-rename-branch(1)</a>,

-<a href="git-new-branch.html">git-new-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>

@@ -840,7 +851,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">

-Last updated 2014-04-10 14:23:11 PDT

+Last updated 2014-07-22 16:12:20 PDT

</div>

</body>

« no previous file with comments | « git_retry.py ('k') | man/man1/git-retry.1 » ('j') | no next file with comments »