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

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: Updated w/ real mission. 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
« git_retry.py ('K') | « 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-mark-merge-base(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-mark-merge-base(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-mark-merge-base - 748 <p>git-retry -
749 Manually interact with depot_tools' merge-base markers. 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 mark-merge-base</em> 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 mark-merge-base</em> &lt;commit hash&gt;
760 <em>git mark-merge-base</em> [-d | --delete]</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>Inspect, set or delete the current merge-base marker f or the current branch. 766 <div class="paragraph"><p><code>git retry</code> is a bootstrap that wraps a sta ndard <code>git</code> command execution in
769 This should not be needed, but is useful if things get into a snarled state. 767 a fault-tolerant retry wrapper.</p></div>
770 Pass no arguments to view the current value. If you provide &lt;commit hash&gt;, then 768 <div class="paragraph"><p>If a retry succeeds, the return code of the successful attempt is returned.
771 <code>git mark-merge-base</code> will attempt to set that as the merge-base valu e.</p></div> 769 Otherwise, the return code of the last failed attempt is returned.</p></div>
772 <div class="paragraph"><p>It is invalid to pick a commit which is not an ancesto r of the current branch.</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>See <a href="git-rebase-update.html">git-rebase-update (1)</a>'s description of the <code>branch.&lt;name&gt;.base</code> 771 retrying if a given failure can be linked to such a condition.</p></div>
774 configuration variable for more info on what the merge base markers are for.</p> </div>
775 </div> 772 </div>
776 </div> 773 </div>
777 <div class="sect1"> 774 <div class="sect1">
778 <h2 id="_options">OPTIONS</h2> 775 <h2 id="_options">OPTIONS</h2>
779 <div class="sectionbody"> 776 <div class="sectionbody">
780 <div class="dlist"><dl> 777 <div class="dlist"><dl>
781 <dt class="hdlist1"> 778 <dt class="hdlist1">
782 -d 779 &lt;git_subcommand&gt;
783 </dt>
784 <dt class="hdlist1">
785 --delete
786 </dt> 780 </dt>
787 <dd> 781 <dd>
788 <p> 782 <p>
789 Delete the merge-base marker for the current branch. 783 The <code>git</code> command to retry. This should omit the actual <code>git</ code> command (e.g.,
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 &lt;commit hash&gt; 788 -v, --verbose
794 </dt> 789 </dt>
795 <dd> 790 <dd>
796 <p> 791 <p>
797 The new value to set for the current branch&#8217;s merge-base marker. 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.
794 </p>
795 </dd>
796 <dt class="hdlist1">
797 -c, --retry-count <em>count</em>
798 </dt>
799 <dd>
800 <p>
801 Specify the number of retries that should be performed before giving up.
802 </p>
803 </dd>
804 <dt class="hdlist1">
805 -d, --delay <em>seconds</em>
806 </dt>
807 <dd>
808 <p>
809 If specified, the time delta to wait in between retry attempts. By default,
810 retries will happen immediately after failures. This can be used to introduce
811 a delay.
812 </p>
813 </dd>
814 <dt class="hdlist1">
815 -e, --delay-exponential
816 </dt>
817 <dd>
818 <p>
819 If specified, the retry delay will double with each retry. Note that if no
820 delay is specified, this will have no effect.
798 </p> 821 </p>
799 </dd> 822 </dd>
800 </dl></div> 823 </dl></div>
801 </div> 824 </div>
802 </div> 825 </div>
803 <div class="sect1"> 826 <div class="sect1">
804 <h2 id="_see_also">SEE ALSO</h2> 827 <h2 id="_exit_status">EXIT STATUS</h2>
805 <div class="sectionbody"> 828 <div class="sectionbody">
806 <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>, 829 <div class="paragraph"><p>Upon success, <code>git retry</code> will exit with th e successful exit code of <strong>0</strong>. On
807 <a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream -diff.html">git-upstream-diff(1)</a></p></div> 830 failure, it will exit with the exit code of the last failed attempt.</p></div>
808 </div> 831 </div>
809 </div> 832 </div>
810 <div class="sect1"> 833 <div class="sect1">
811 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 834 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
812 <div class="sectionbody"> 835 <div class="sectionbody">
813 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 836 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
814 assist with the development of chromium and related projects. Download the tools 837 assist with the development of chromium and related projects. Download the tools
815 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 838 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
816 </div> 839 </div>
817 </div> 840 </div>
818 </div> 841 </div>
819 <div id="footnotes"><hr /></div> 842 <div id="footnotes"><hr /></div>
820 <div id="footer"> 843 <div id="footer">
821 <div id="footer-text"> 844 <div id="footer-text">
822 Last updated 2014-04-10 14:23:11 PDT 845 Last updated 2014-07-17 15:05:45 PDT
823 </div> 846 </div>
824 </div> 847 </div>
825 </body> 848 </body>
826 </html> 849 </html>
OLDNEW
« git_retry.py ('K') | « git_retry.py ('k') | man/man1/git-retry.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698