Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « git_retry.py ('k') | man/man1/git-retry.1 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >
6 <meta name="generator" content="AsciiDoc 8.6.9" /> 6 <meta name="generator" content="AsciiDoc 8.6.9" />
7 <title>git-reparent-branch(1)</title> 7 <title>git-retry(1)</title>
8 <style type="text/css"> 8 <style type="text/css">
9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10 10
11 /* Default font. */ 11 /* Default font. */
12 body { 12 body {
13 font-family: Georgia,serif; 13 font-family: Georgia,serif;
14 } 14 }
15 15
16 /* Title font. */ 16 /* Title font. */
17 h1, h2, h3, h4, h5, h6, 17 h1, h2, h3, h4, h5, h6,
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 } 734 }
735 735
736 } 736 }
737 asciidoc.install(); 737 asciidoc.install();
738 /*]]>*/ 738 /*]]>*/
739 </script> 739 </script>
740 </head> 740 </head>
741 <body class="manpage"> 741 <body class="manpage">
742 <div id="header"> 742 <div id="header">
743 <h1> 743 <h1>
744 git-reparent-branch(1) Manual Page 744 git-retry(1) Manual Page
745 </h1> 745 </h1>
746 <h2>NAME</h2> 746 <h2>NAME</h2>
747 <div class="sectionbody"> 747 <div class="sectionbody">
748 <p>git-reparent-branch - 748 <p>git-retry -
749 Alter the parentage (upstream) for the current branch. 749 Bootstrap function to retry a git command.
750 </p> 750 </p>
751 </div> 751 </div>
752 </div> 752 </div>
753 <div id="content"> 753 <div id="content">
754 <div class="sect1"> 754 <div class="sect1">
755 <h2 id="_synopsis">SYNOPSIS</h2> 755 <h2 id="_synopsis">SYNOPSIS</h2>
756 <div class="sectionbody"> 756 <div class="sectionbody">
757 <div class="verseblock"> 757 <div class="verseblock">
758 <pre class="content"><em>git reparent-branch</em> &lt;new_parent&gt; 758 <pre class="content"><em>git retry</em> [-v] [-c COUNT] [-d DELAY] [-e]&#8201;&# 8212;&#8201;<em>&lt;git_subcommand&gt;</em></pre>
759 <em>git reparent-branch</em> --lkgr
760 <em>git reparent-branch</em> --root</pre>
761 <div class="attribution"> 759 <div class="attribution">
762 </div></div> 760 </div></div>
763 </div> 761 </div>
764 </div> 762 </div>
765 <div class="sect1"> 763 <div class="sect1">
766 <h2 id="_description">DESCRIPTION</h2> 764 <h2 id="_description">DESCRIPTION</h2>
767 <div class="sectionbody"> 765 <div class="sectionbody">
768 <div class="paragraph"><p>Change the <em>upstream</em> of the current branch, an d then run 766 <div class="paragraph"><p><code>git retry</code> is a bootstrap that wraps a sta ndard <code>git</code> command execution in
769 <a href="git-rebase-update.html">git-rebase-update(1)</a> to move the commits in the current branch, as well 767 a fault-tolerant retry wrapper.</p></div>
770 as the commits in all descendant branches, onto the new parent.</p></div> 768 <div class="paragraph"><p>If a retry succeeds, the return code of the successful attempt is returned.
771 <div class="paragraph"><p><code>&lt;new_parent&gt;</code> may be either a local branch, remote branch, OR a tag (such as 769 Otherwise, the return code of the last failed attempt is returned.</p></div>
772 <code>lkgr</code>).</p></div> 770 <div class="paragraph"><p>The wrapper is aware of <code>git</code>-specific fail ure conditions and will only consider
773 <div class="paragraph"><p>This is particularly useful to reparent an independent CL to become dependent on 771 retrying if a given failure can be linked to such a condition.</p></div>
774 another CL, or vice versa. This could happen if you started both on the
775 assumption that they were independent, but later realized that this was not the
776 case.</p></div>
777 </div> 772 </div>
778 </div> 773 </div>
779 <div class="sect1"> 774 <div class="sect1">
780 <h2 id="_options">OPTIONS</h2> 775 <h2 id="_options">OPTIONS</h2>
781 <div class="sectionbody"> 776 <div class="sectionbody">
782 <div class="dlist"><dl> 777 <div class="dlist"><dl>
783 <dt class="hdlist1"> 778 <dt class="hdlist1">
784 &lt;new_parent&gt; 779 &lt;git_subcommand&gt;
785 </dt> 780 </dt>
786 <dd> 781 <dd>
787 <p> 782 <p>
788 The new parent to set as the upstream for this branch. May be a branch ref or 783 The <code>git</code> command to retry. This should omit the actual <code>git</ code> command (e.g.,
789 a tag. 784 to retry <code>git clone</code>, use <code>git retry clone</code>).
790 </p> 785 </p>
791 </dd> 786 </dd>
792 <dt class="hdlist1"> 787 <dt class="hdlist1">
793 --lkgr 788 -v, --verbose
794 </dt> 789 </dt>
795 <dd> 790 <dd>
796 <p> 791 <p>
797 Reparent to track lkgr. 792 Increases logging verbosity. By default, no additional logging is generated
793 by the <code>git retry</code> command. This can be specified multiple times.
798 </p> 794 </p>
799 </dd> 795 </dd>
800 <dt class="hdlist1"> 796 <dt class="hdlist1">
801 --root 797 -c, --retry-count <em>count</em>
802 </dt> 798 </dt>
803 <dd> 799 <dd>
804 <p> 800 <p>
805 Reparent to track the <em>root</em> branch. Defaults to <em>origin/master</em> . See 801 Specify the number of retries that should be performed before giving up. The
806 <a href="git-new-branch.html">git-new-branch(1)</a>'s CONFIGURATION VARIABLES section.. 802 default retry count is <strong>5</strong>.
807 </p> 803 </p>
808 </dd> 804 </dd>
805 <dt class="hdlist1">
806 -d, --delay <em>seconds</em>
807 </dt>
808 <dd>
809 <p>
810 Floating-point value that specifies the amount of time (in seconds) to wait
811 after a failure. This can be zero to specify no delay. The default delay is
812 <strong>3 seconds</strong>.
813 </p>
814 </dd>
815 <dt class="hdlist1">
816 -D, --delay-factor
817 </dt>
818 <dd>
819 <p>
820 The exponential factor to apply to the delay. By default this is <strong>2</st rong>.
821 For a given retry round <strong>n</strong>, the delay for that round will be
822 <strong>(&lt;delay-factor&gt;^(n-1) * delay)</strong>. If no delay is specifie d, this will have
823 no effect.
824 If the delay factor is <strong>0</strong>, the delay will increase linearly (f or a given
825 retry round <strong>n</strong>, the delay will be <strong>(n * delay)</strong> ).
826 </p>
827 <div class="literalblock">
828 <div class="content">
829 <pre><code>(Note that a delay factor of *1* will result in a constant delay.)</c ode></pre>
830 </div></div>
831 </dd>
809 </dl></div> 832 </dl></div>
810 </div> 833 </div>
811 </div> 834 </div>
812 <div class="sect1"> 835 <div class="sect1">
813 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> 836 <h2 id="_exit_status">EXIT STATUS</h2>
814 <div class="sectionbody"> 837 <div class="sectionbody">
815 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em> 838 <div class="paragraph"><p>Upon success, <code>git retry</code> will exit with th e successful exit code of <strong>0</strong>. On
816 file.</p></div> 839 failure, it will exit with the exit code of the last failed attempt.</p></div>
817 <div class="listingblock">
818 <div class="content">
819 <pre><code>[alias]
820 git rp = reparent-branch</code></pre>
821 </div></div>
822 </div> 840 </div>
823 </div> 841 </div>
824 <div class="sect1"> 842 <div class="sect1">
825 <h2 id="_see_also">SEE ALSO</h2>
826 <div class="sectionbody">
827 <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>,
828 <a href="git-new-branch.html">git-new-branch(1)</a>, <a href="git-upstream-diff. html">git-upstream-diff(1)</a></p></div>
829 </div>
830 </div>
831 <div class="sect1">
832 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 843 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
833 <div class="sectionbody"> 844 <div class="sectionbody">
834 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 845 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
835 assist with the development of chromium and related projects. Download the tools 846 assist with the development of chromium and related projects. Download the tools
836 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 847 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
837 </div> 848 </div>
838 </div> 849 </div>
839 </div> 850 </div>
840 <div id="footnotes"><hr /></div> 851 <div id="footnotes"><hr /></div>
841 <div id="footer"> 852 <div id="footer">
842 <div id="footer-text"> 853 <div id="footer-text">
843 Last updated 2014-04-10 14:23:11 PDT 854 Last updated 2014-07-22 16:12:20 PDT
844 </div> 855 </div>
845 </div> 856 </div>
846 </body> 857 </body>
847 </html> 858 </html>
OLDNEW
« no previous file with comments | « git_retry.py ('k') | man/man1/git-retry.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698