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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: man/html/git-cherry-pick-upload.html

Issue 397593004: Add git cherry picking extension (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 | « git_cherry_pick_upload.py ('k') | man/man1/git-cherry-pick-upload.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-cherry-pick-upload(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-cherry-pick-upload(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-cherry-pick-upload -
749 Manually interact with depot_tools' merge-base markers. 749 Upload the diff between a revision and its parent to rietveld.
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 cherry-pick-upload --branch &lt;remote_branch_name& gt; &lt;commit_hash&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 cherry-pick-upload</code> is used to upload a cherry pick to rietveld. It uses
769 This should not be needed, but is useful if things get into a snarled state. 767 your view of the remote to generate the diff between a revision and its parent,
770 Pass no arguments to view the current value. If you provide &lt;commit hash&gt;, then 768 and then uploads that diff to rietveld.</p></div>
771 <code>git mark-merge-base</code> will attempt to set that as the merge-base valu e.</p></div> 769 <div class="paragraph"><p>The commit message is annotated with "(cherry picked f rom commit [parent sha1])"
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 as if it were generated by <code>git cherry-pick -x</code>.</p></div>
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>
774 configuration variable for more info on what the merge base markers are for.</p> </div>
775 </div> 771 </div>
776 </div> 772 </div>
777 <div class="sect1"> 773 <div class="sect1">
778 <h2 id="_options">OPTIONS</h2> 774 <h2 id="_example">EXAMPLE</h2>
779 <div class="sectionbody"> 775 <div class="sectionbody">
780 <div class="dlist"><dl> 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>
781 <dt class="hdlist1"> 777 usage: git_cherry_pick_upload.py [-h] --branch &lt;branch&gt; &lt;commit&gt;
782 -d 778
783 </dt> 779 positional arguments:
784 <dt class="hdlist1"> 780 &lt;commit&gt; SHA to cherry pick.
785 --delete 781
786 </dt> 782 optional arguments:
787 <dd> 783 -h, --help show this help message and exit
788 <p> 784 --branch &lt;branch&gt;, -b &lt;branch&gt;
789 Delete the merge-base marker for the current branch. 785 The upstream branch to cherry pick to.
790 </p> 786
791 </dd> 787 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick-upload -b my_b ranch c02b7d24a066adb747fdeb12deb21bfa</span>
792 <dt class="hdlist1"> 788 Found parent revision: b96d69fda53845a205151613a9c4cc93
793 &lt;commit hash&gt; 789 Loaded authentication cookies from .codereview_upload_cookies
794 </dt> 790 Issue created. URL: https://codereview.chromium.org/1234567890
795 <dd> 791 Uploading base_file for some/path/first.file: OK
796 <p> 792 Uploading some/path/first.file: OK
797 The new value to set for the current branch&#8217;s merge-base marker. 793 Uploading base_file for some/path/second.file: OK
798 </p> 794 Uploading some/path/second.file: OK
799 </dd> 795 Uploading base_file for some/path/third.file: OK
800 </dl></div> 796 Uploading some/path/third.file: OK
797 Finalizing upload: OK
798 </code></pre></div></div><p><div class="paragraph"></p></div>
801 </div> 799 </div>
802 </div> 800 </div>
803 <div class="sect1"> 801 <div class="sect1">
804 <h2 id="_see_also">SEE ALSO</h2> 802 <h2 id="_see_also">SEE ALSO</h2>
805 <div class="sectionbody"> 803 <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>, 804 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>
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> 805 <a href="git-cl-upload.html">git-cl-upload(1)</a></p></div>
808 </div> 806 </div>
809 </div> 807 </div>
810 <div class="sect1"> 808 <div class="sect1">
811 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 809 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
812 <div class="sectionbody"> 810 <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 811 <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 812 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> 813 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
816 </div> 814 </div>
817 </div> 815 </div>
818 </div> 816 </div>
819 <div id="footnotes"><hr /></div> 817 <div id="footnotes"><hr /></div>
820 <div id="footer"> 818 <div id="footer">
821 <div id="footer-text"> 819 <div id="footer-text">
822 Last updated 2014-04-10 14:23:11 PDT 820 Last updated 2014-07-23 14:38:36 PDT
823 </div> 821 </div>
824 </div> 822 </div>
825 </body> 823 </body>
826 </html> 824 </html>
OLDNEW
« no previous file with comments | « git_cherry_pick_upload.py ('k') | man/man1/git-cherry-pick-upload.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698