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

Side by Side Diff: man/html/git-drover.html

Issue 494873003: Add stub git-drover documentation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 4 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 | « no previous file | man/man1/git-drover.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-cherry-pick-upload(1)</title> 7 <title>git-drover(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-cherry-pick-upload(1) Manual Page 744 git-drover(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-cherry-pick-upload - 748 <p>git-drover -
749 Upload the diff between a revision and its parent to rietveld. 749 Apply a commit from the trunk to a release branch, or from one release branch to another.
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 cherry-pick-upload</em> --branch &lt;remote_branch_ name&gt; &lt;commit_hash&gt;</pre> 758 <pre class="content"><em>git drover</em></pre>
759 <div class="attribution"> 759 <div class="attribution">
760 </div></div> 760 </div></div>
761 </div> 761 </div>
762 </div> 762 </div>
763 <div class="sect1"> 763 <div class="sect1">
764 <h2 id="_description">DESCRIPTION</h2> 764 <h2 id="_description">DESCRIPTION</h2>
765 <div class="sectionbody"> 765 <div class="sectionbody">
766 <div class="paragraph"><p><code>git cherry-pick-upload</code> is used to upload a cherry pick to rietveld. It uses 766 <div class="paragraph"><p><code>git drover</code> is NOT IMPLEMENTED yet. See th e EXAMPLE section for the equivalent
767 your view of the remote to generate the diff between a revision and its parent, 767 sequence of commands to run.</p></div>
768 and then uploads that diff to rietveld.</p></div>
769 <div class="paragraph"><p>The commit message is annotated with "(cherry picked f rom commit [parent sha1])"
770 as if it were generated by <code>git cherry-pick -x</code>.</p></div>
771 </div> 768 </div>
772 </div> 769 </div>
773 <div class="sect1"> 770 <div class="sect1">
774 <h2 id="_example">EXAMPLE</h2> 771 <h2 id="_example">EXAMPLE</h2>
775 <div class="sectionbody"> 772 <div class="sectionbody">
776 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git cherry-pick- upload -h</span> 773 <div class="paragraph"><p> Before working with branches, you must 'gclient sync --with_branch_heads' at least once to fetch the branches.</p></div><div class="l istingblock"><div class="content"><pre><code><span style="font-weight: bold; col or: #ffffff">$ git log -n 1 --pretty=fuller</span>
777 usage: git_cherry_pick_upload.py [-h] --branch &lt;branch&gt; &lt;commit&gt; 774 commit 49fde8547a38bf27d38cbf3fac783cdf2ddc5f47
775 Author: some.committer &lt;some.committer@chromium.org&gt;
776 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
777 Commit: some.committer &lt;some.committer@chromium.org&gt;
778 CommitDate: Thu Apr 10 08:54:46 2014 +0000
778 779
779 positional arguments: 780 This change needs to go to branch 9999
780 &lt;commit&gt; SHA to cherry pick. 781 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
782 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
783 # DO NOT leave off the '-x' flag
784 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 49fde8547a3 8bf27d38cbf3fac783cdf2ddc5f47</span>
785 [drover_9999 1e33c2c] This change needs to go to branch 9999
786 Author: some.committer &lt;some.committer@chromium.org&gt;
787 Date: Thu Apr 10 08:54:46 2014 +0000
788 1 file changed, 1 insertion(+)
789 create mode 100644 modified_file
790 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
791 commit 1e33c2ccf642703a6c1c582210fe63980dc6c45b
792 Author: some.committer &lt;some.committer@chromium.org&gt;
793 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
794 Commit: branch.maintainer &lt;branch.maintainer@chromium.org&gt;
795 CommitDate: Thu Apr 10 09:11:36 2014 +0000
781 796
782 optional arguments: 797 This change needs to go to branch 9999
783 -h, --help show this help message and exit
784 --branch &lt;branch&gt;, -b &lt;branch&gt;
785 The upstream branch to cherry pick to.
786 798
787 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick-upload -b my_b ranch c02b7d24a066adb747fdeb12deb21bfa</span> 799 (cherry picked from commit 49fde8547a38bf27d38cbf3fac783cdf2ddc5f47)
788 Found parent revision: b96d69fda53845a205151613a9c4cc93 800 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
789 Loaded authentication cookies from .codereview_upload_cookies 801 # Get LGTM or TBR.
790 Issue created. URL: https://codereview.chromium.org/1234567890 802 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>
791 Uploading base_file for some/path/first.file: OK
792 Uploading some/path/first.file: OK
793 Uploading base_file for some/path/second.file: OK
794 Uploading some/path/second.file: OK
795 Uploading base_file for some/path/third.file: OK
796 Uploading some/path/third.file: OK
797 Finalizing upload: OK
798 </code></pre></div></div><p><div class="paragraph"></p></div> 803 </code></pre></div></div><p><div class="paragraph"></p></div>
799 </div> 804 </div>
800 </div> 805 </div>
801 <div class="sect1"> 806 <div class="sect1">
802 <h2 id="_see_also">SEE ALSO</h2> 807 <h2 id="_see_also">SEE ALSO</h2>
803 <div class="sectionbody"> 808 <div class="sectionbody">
804 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a> 809 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>< /p></div>
805 <a href="git-cl-upload.html">git-cl-upload(1)</a></p></div>
806 </div> 810 </div>
807 </div> 811 </div>
808 <div class="sect1"> 812 <div class="sect1">
809 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 813 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
810 <div class="sectionbody"> 814 <div class="sectionbody">
811 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 815 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
812 assist with the development of chromium and related projects. Download the tools 816 assist with the development of chromium and related projects. Download the tools
813 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 817 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
814 </div> 818 </div>
815 </div> 819 </div>
816 </div> 820 </div>
817 <div id="footnotes"><hr /></div> 821 <div id="footnotes"><hr /></div>
818 <div id="footer"> 822 <div id="footer">
819 <div id="footer-text"> 823 <div id="footer-text">
820 Last updated 2014-08-20 09:39:48 PDT 824 Last updated 2014-08-20 16:12:01 PDT
821 </div> 825 </div>
822 </div> 826 </div>
823 </body> 827 </body>
824 </html> 828 </html>
OLDNEW
« no previous file with comments | « no previous file | man/man1/git-drover.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698