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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 561433002: Clear up some git-drover docs confusion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 3 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-drover(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
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
773 <div class="sect2"> 773 <div class="sect2">
774 <h3 id="_prerequisites">PREREQUISITES</h3> 774 <h3 id="_prerequisites">PREREQUISITES</h3>
775 <div class="paragraph"><p>Before working with branches, you must 775 <div class="paragraph"><p>Before working with branches, you must
776 <code>gclient sync --with_branch_heads</code> 776 <code>gclient sync --with_branch_heads</code>
777 at least once to fetch the branches.</p></div> 777 at least once to fetch the branches.</p></div>
778 <div class="sect3"> 778 <div class="sect3">
779 <h4 id="_merge_example">Merge Example</h4> 779 <h4 id="_merge_example">Merge Example</h4>
780 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources. 780 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.
781 <span style="font-weight: bold; color: #ffffff">$ git fetch</span> 781 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
782 782
783 # Here's the commit we want to 'drover'. 783 # Here's a commit (from some.committer) that we want to 'drover'.
784 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 784 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
785 commit 1077c7acbc1f1881d5181f6b1eaf4d0c6cd92543 785 commit 4a00a0c3c1bb01f11b42cb70f3ad587026cec02b
786 Author: some.committer &lt;some.committer@chromium.org&gt; 786 Author: some.committer &lt;some.committer@chromium.org&gt;
787 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 787 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
788 Commit: some.committer &lt;some.committer@chromium.org&gt; 788 Commit: some.committer &lt;some.committer@chromium.org&gt;
789 CommitDate: Thu Apr 10 08:54:46 2014 +0000 789 CommitDate: Thu Apr 10 08:54:46 2014 +0000
790 790
791 This change needs to go to branch 9999 791 This change needs to go to branch 9999
792 792
793 # Checkout the branch we want to 'drover' to. 793 # Checkout the branch we want to 'drover' to.
794 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span> 794 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
795 Branch drover_9999 set up to track remote ref refs/branch-heads/9999. 795 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
796 796
797 # Now do the 'drover'. 797 # Now do the 'drover'.
798 # IMPORTANT!!! Do Not leave off the '-x' flag 798 # IMPORTANT!!! Do Not leave off the '-x' flag
799 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 1077c7acbc1 f1881d5181f6b1eaf4d0c6cd92543</span> 799 <span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 4a00a0c3c1b b01f11b42cb70f3ad587026cec02b</span>
800 [drover_9999 1d9c1a1] This change needs to go to branch 9999 800 [drover_9999 19d3d0b] This change needs to go to branch 9999
801 Author: some.committer &lt;some.committer@chromium.org&gt; 801 Author: some.committer &lt;some.committer@chromium.org&gt;
802 Date: Thu Apr 10 08:54:46 2014 +0000 802 Date: Thu Apr 10 08:54:46 2014 +0000
803 1 file changed, 1 insertion(+) 803 1 file changed, 1 insertion(+)
804 create mode 100644 modified_file 804 create mode 100644 modified_file
805 805
806 # That took the code authored by some.commiter and commited it to the 806 # That took the code authored by some.committer and committed it to
807 # branch by branch.maintainer (us). 807 # the branch by the person who drovered it (i.e. you).
808 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span> 808 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</ span>
809 commit 1d9c1a1b768f2248c884495f4d47739c2ff249f7 809 commit 19d3d0b9d8f802df8e2fd563cbc919679d310ecd
810 Author: some.committer &lt;some.committer@chromium.org&gt; 810 Author: some.committer &lt;some.committer@chromium.org&gt;
811 AuthorDate: Thu Apr 10 08:54:46 2014 +0000 811 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
812 Commit: branch.maintainer &lt;branch.maintainer@chromium.org&gt; 812 Commit: you &lt;you@chromium.org&gt;
813 CommitDate: Thu Apr 10 09:11:36 2014 +0000 813 CommitDate: Thu Apr 10 09:11:36 2014 +0000
814 814
815 This change needs to go to branch 9999 815 This change needs to go to branch 9999
816 816
817 (cherry picked from commit 1077c7acbc1f1881d5181f6b1eaf4d0c6cd92543) 817 (cherry picked from commit 4a00a0c3c1bb01f11b42cb70f3ad587026cec02b)
818 818
819 # Looks good. Ship it! 819 # Looks good. Ship it!
820 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span> 820 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
821 # Wait for LGTM or TBR it. 821 # Wait for LGTM or TBR it.
822 <span style="font-weight: bold; color: #ffffff">$ git cl land</span> 822 <span style="font-weight: bold; color: #ffffff">$ git cl land</span>
823 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks' 823 # Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
824 </code></pre></div></div><p><div class="paragraph"></p></div> 824 </code></pre></div></div><p><div class="paragraph"></p></div>
825 </div> 825 </div>
826 <div class="sect3"> 826 <div class="sect3">
827 <h4 id="_revert_example">Revert Example</h4> 827 <h4 id="_revert_example">Revert Example</h4>
828 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources. 828 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code># Make sure we have the most up-to-date branch sources.
829 <span style="font-weight: bold; color: #ffffff">$ git fetch</span> 829 <span style="font-weight: bold; color: #ffffff">$ git fetch</span>
830 830
831 # Checkout the branch with the change we want to revert. 831 # Checkout the branch with the change we want to revert.
832 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span> 832 <span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 br anch-heads/9999</span>
833 Branch drover_9999 set up to track remote ref refs/branch-heads/9999. 833 Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
834 834
835 # Here's the commit we want to revert. 835 # Here's the commit we want to revert.
836 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span> 836 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
837 commit aca17ebfc070673e98afb6d36f6028eae6b0b8ca 837 commit 590b333cbc04d13da67b2a1c5282835d4f27e398
838 Author: some.committer &lt;some.committer@chromium.org&gt; 838 Author: some.committer &lt;some.committer@chromium.org&gt;
839 Date: Thu Apr 10 08:54:46 2014 +0000 839 Date: Thu Apr 10 08:54:46 2014 +0000
840 840
841 This change is horribly broken. 841 This change is horribly broken.
842 842
843 # Now do the revert. 843 # Now do the revert.
844 <span style="font-weight: bold; color: #ffffff">$ git revert aca17ebfc070673e98a fb6d36f6028eae6b0b8ca</span> 844 <span style="font-weight: bold; color: #ffffff">$ git revert 590b333cbc04d13da67 b2a1c5282835d4f27e398</span>
845 845
846 # That reverted the change and committed the revert. 846 # That reverted the change and committed the revert.
847 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span> 847 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
848 commit d27f8f3fd56621c5e3a92cb5e64100e2bc2137a2 848 commit 6f541155a9adf98f4e7f94dd561d022fb022d43f
849 Author: branch.maintainer &lt;branch.maintainer@chromium.org&gt; 849 Author: you &lt;you@chromium.org&gt;
850 Date: Thu Apr 10 09:11:36 2014 +0000 850 Date: Thu Apr 10 09:11:36 2014 +0000
851 851
852 Revert "This change is horribly broken." 852 Revert "This change is horribly broken."
853 853
854 This reverts commit aca17ebfc070673e98afb6d36f6028eae6b0b8ca. 854 This reverts commit 590b333cbc04d13da67b2a1c5282835d4f27e398.
855 855
856 # As with old drover, reverts are generally OK to commit without LGTM. 856 # As with old drover, reverts are generally OK to commit without LGTM.
857 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committe r@chromium.org --send-mail</span> 857 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committe r@chromium.org --send-mail</span>
858 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</sp an> 858 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</sp an>
859 </code></pre></div></div><p><div class="paragraph"></p></div> 859 </code></pre></div></div><p><div class="paragraph"></p></div>
860 </div> 860 </div>
861 </div> 861 </div>
862 </div> 862 </div>
863 </div> 863 </div>
864 <div class="sect1"> 864 <div class="sect1">
865 <h2 id="_see_also">SEE ALSO</h2> 865 <h2 id="_see_also">SEE ALSO</h2>
866 <div class="sectionbody"> 866 <div class="sectionbody">
867 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a> 867 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a>, <a href="git-revert.html">git-revert(1)</a></p></div>
868 <a href="git-revert.html">git-revert(1)</a></p></div>
869 </div> 868 </div>
870 </div> 869 </div>
871 <div class="sect1"> 870 <div class="sect1">
872 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 871 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
873 <div class="sectionbody"> 872 <div class="sectionbody">
874 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 873 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
875 assist with the development of chromium and related projects. Download the tools 874 assist with the development of chromium and related projects. Download the tools
876 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 875 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
877 </div> 876 </div>
878 </div> 877 </div>
879 </div> 878 </div>
880 <div id="footnotes"><hr /></div> 879 <div id="footnotes"><hr /></div>
881 <div id="footer"> 880 <div id="footer">
882 <div id="footer-text"> 881 <div id="footer-text">
883 Last updated 2014-09-05 16:32:10 PDT 882 Last updated 2014-09-09 13:42:13 PDT
884 </div> 883 </div>
885 </div> 884 </div>
886 </body> 885 </body>
887 </html> 886 </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