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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-rebase-update.html

Issue 184253003: Add git-reup and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw
Patch Set: minor fixes Created 6 years, 9 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
« docs/html/git-freeze.html ('K') | « docs/html/git-new-branch.html ('k') | docs/html/git-rename-branch.html » ('j') | docs/src/git-new-branch.txt » ('J')
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-map(1)</title> 7 <title>git-rebase-update(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-map(1) Manual Page 744 git-rebase-update(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-map - 748 <p>git-rebase-update -
749 Display history of all branches in a colorized terminal format. 749 Updates all branches to have the latest changes from their upstreams.
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 map</em> [&lt;extra_args&gt;&#8230;]</pre> 758 <pre class="content"><em>git rebase-update</em> [-v | --verbose] [-n | --no_fetc h]</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>Git map formats the output of <code>git log --graph</c ode> from all refs such that:</p></div> 766 <div class="paragraph"><p>Brings all branches up-to-date with their tracking bra nches. This involves
767 <div class="ulist"><ul> 767 several phases:</p></div>
768 <li> 768 <div class="dlist"><dl>
769 <dt class="hdlist1">
770 Preparation
771 </dt>
772 <dd>
769 <p> 773 <p>
770 Current branch is <span class="aqua">cyan</span>. 774 If you currently have a branch checked out, any changes on that branch a re
775 <em>frozen</em> (See <a href="git-freeze.html">git-freeze(1)</a> for mor e detail). Additionally, the current
776 branch is recorded for the <em>Restoration</em> phase later (see <em>CON FIGURATION
777 VARIABLES</em> for details on <code>depot-tools.rebase-update.starting-b ranch</code>).
771 </p> 778 </p>
772 </li> 779 </dd>
773 <li> 780 <dt class="hdlist1">
781 Fetching
782 </dt>
783 <dd>
774 <p> 784 <p>
775 Local branches are <span class="green">green</span>. 785 All branches are examined to find their upstream references. The correct set
786 of git remotes is determined, and fetched accordingly. Note that if any
787 branches have a tag as their upstream, we are forced to pull all remotes .
776 </p> 788 </p>
777 </li> 789 <div class="paragraph"><p>Pass <code>--no_fetch</code> to skip this phase.</p></ div>
778 <li> 790 </dd>
791 <dt class="hdlist1">
792 Rebasing
793 </dt>
794 <dd>
779 <p> 795 <p>
780 Remote branches are <span class="red">red</span>. 796 All branches are rebased in topological order from roots (upstreams) to leafs.
797 Each branch is rebased from its marked merge-base (see <em>CONFIGURATION
798 VARIABLES</em>) to the branch tip on top of its parent branch. If the pa rent
799 branch is <em>frozen</em> (see <a href="git-freeze.html">git-freeze(1)</ a>), the branch will be rebased
800 onto the last non-freeze commit on the parent branch.
781 </p> 801 </p>
782 </li> 802 <div class="paragraph"><p>Things get interesting when there are merge conflicts on rebase. The <strong>most
783 <li> 803 common</strong> cause for conflicts is when your branch has been committed to th e
804 upstream in squashed form, ala <a href="git-squash-branch.html">git-squash-branc h(1)</a>, which is what
805 <a href="git-cl.html">git-cl(1)</a> and the <em>Commit Queue</em> will do. Becau se of that, <code>git
806 rebase-update</code> will attempt to squash your conflicted branch to see if the
807 squashed version applies cleanly to its upstream.</p></div>
808 <div class="paragraph"><p>If it does not apply cleanly, then your original (non- squashed) branch will be
809 left in mid-rebase and <code>git rebase-update</code> will exit. You can deal wi th this
810 like any other conflicted rebase. When you&#8217;re done, just <code>git rebase- update</code>
811 again to pick up where you left off.</p></div>
812 </dd>
813 <dt class="hdlist1">
814 Cleanup
815 </dt>
816 <dd>
784 <p> 817 <p>
785 Tags are <span class="fuchsia">magenta</span>. 818 Once all the branches have been rebased, any empty branches (i.e. branch es
819 with no commits on them) are removed. If a branch is removed in this fas hion,
820 any branches which depend on it are reparented to the parent of the remo ved
821 branch (see <a href="git-reparent-branch.html">git-reparent-branch(1)</a >).
786 </p> 822 </p>
787 </li> 823 </dd>
788 <li> 824 <dt class="hdlist1">
825 Restoration
826 </dt>
827 <dd>
789 <p> 828 <p>
790 The currently checked out commit is highlighted with a <span class="yellow blue- background">blue background</span>. 829 <code>git rebase-update</code> checks out the branch that you started on , and <em>thaws</em> it,
830 if necessary (see <a href="git-thaw.html">git-thaw(1)</a>). If the branc h you started on got
831 cleaned up, <code>git rebase-update</code> will checkout the <em>root</e m> ref (defaults to
832 <em>origin/master</em>, as configured by <code>depot-tools.upstream</cod e>, see
833 <a href="git-new-branch.html">git-new-branch(1)</a>).
791 </p> 834 </p>
792 </li> 835 </dd>
793 </ul></div> 836 </dl></div>
794 <div class="paragraph"><p>The output is automatically piped through the <code>le ss</code> pager command, even on
795 windows.</p></div>
796 </div> 837 </div>
797 </div> 838 </div>
798 <div class="sect1"> 839 <div class="sect1">
799 <h2 id="_options">OPTIONS</h2> 840 <h2 id="_options">OPTIONS</h2>
800 <div class="sectionbody"> 841 <div class="sectionbody">
801 <div class="dlist"><dl> 842 <div class="dlist"><dl>
802 <dt class="hdlist1"> 843 <dt class="hdlist1">
803 &lt;extra_args&gt;&#8230; 844 -n
845 </dt>
846 <dt class="hdlist1">
847 --no_fetch
804 </dt> 848 </dt>
805 <dd> 849 <dd>
806 <p> 850 <p>
807 Extra parameters to pass to the internal <a href="git-log.html">git-log( 1)</a> invocation. This 851 Skip the <code>git fetch</code> phase of rebase-update.
808 can be used to restrict what refs <em>git map</em> operates on, etc.
809 </p> 852 </p>
810 <div class="paragraph"><p>If you run git map with a series of fixed arguments fr equently, you can use 853 </dd>
811 the depot_tools.map_extra configuration variable to pre-set arguments (See 854 <dt class="hdlist1">
812 <code>CONFIGURATION VARIABLES</code>)</p></div> 855 -v
856 </dt>
857 <dt class="hdlist1">
858 --verbose
859 </dt>
860 <dd>
861 <p>
862 More text than your terminal can handle.
863 </p>
813 </dd> 864 </dd>
814 </dl></div> 865 </dl></div>
815 </div> 866 </div>
816 </div> 867 </div>
817 <div class="sect1"> 868 <div class="sect1">
818 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2> 869 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
819 <div class="sectionbody"> 870 <div class="sectionbody">
820 <div class="sect2"> 871 <div class="sect2">
821 <h3 id="_depot_tools_map_extra">depot_tools.map_extra</h3> 872 <h3 id="_depot_tools_rebase_update_starting_branch">depot-tools.rebase-update.st arting-branch</h3>
822 <div class="paragraph"><p>Each value of the <em>depot_tools.map_extra</em> confi g variable is applied as an 873 <div class="paragraph"><p>When <code>git rebase-update</code> first runs, it wil l record the current branch here so
823 additional argument to <code>git log</code> during the execution of git map. If you wish to 874 that when it completes successfully, it will return back to the same branch you
824 configure this, use git <code>config --add depot_tools.map_extra &lt;value&gt;</ code> to do so.</p></div> 875 started on, even if <code>git rebase-update</code> is interrupted due to rebase conflicts.
876 When <code>git rebase-update</code> completes successfully, this configuration v ariable is
877 removed.</p></div>
878 </div>
879 <div class="sect2">
880 <h3 id="_branch_lt_name_gt_dormant">branch.&lt;name&gt;.dormant</h3>
881 <div class="paragraph"><p>If <code>true</code>, will cause rebase-update to skip all processing on the branch.
882 Useful for old/high-conflict branches which you want to keep for posterity, but
883 don&#8217;t want to deal with when running <code>git rebase-update</code></p></d iv>
884 </div>
885 <div class="sect2">
886 <h3 id="_branch_lt_name_gt_base">branch.&lt;name&gt;.base</h3>
887 <div class="paragraph"><p>Holds the <em>base</em> reference for this branch. By default this is equivalent to
888 <code>git merge-base &lt;name&gt; &lt;name&gt;@{upstream}</code>. However, it ca n diverge if
889 <code>&lt;name&gt;@{upstream}</code> is manually rebased. In this case, it corre ctly preserves
890 the value it had before, where <code>git merge-base</code> would now report the wrong
891 value.</p></div>
892 <div class="paragraph"><p>All of the tools in the <a href="depot_tools.html">dep ot_tools(1)</a> suite collude to keep this value
893 as up-to-date as possible, including <a href="git-reparent-branch.html">git-repa rent-branch(1)</a>, and
894 <a href="git-new-branch.html">git-new-branch(1)</a>. <a href="git-map.html">git- map(1)</a> also shows the location of these
895 marker values in <strong><span class="black-background white">white</span></stro ng>.</p></div>
896 <div class="paragraph"><p><a href="git-mark-merge-base.html">git-mark-merge-base (1)</a> allows easy manual interaction for this value,
897 in the unlikely event that it gets out of sync.</p></div>
825 </div> 898 </div>
826 </div> 899 </div>
827 </div> 900 </div>
828 <div class="sect1"> 901 <div class="sect1">
829 <h2 id="_example">EXAMPLE</h2> 902 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
830 <div class="sectionbody"> 903 <div class="sectionbody">
831 <div class="paragraph"><p>Running <em>git map</em> would result in an output som ething like:</p></div> 904 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
905 file.</p></div>
832 <div class="listingblock"> 906 <div class="listingblock">
833 <div class="content"> 907 <div class="content">
834 <pre><code><strong><span class="white">$ git map</span></strong> 908 <pre><code>[alias]
835 <span class="white blue-background">*</span>&#8203;<strong><span class="blue-bac kground red"> 7dcfe47 </span></strong> <span class="green">(</span>&#8203; <strong><span class="aqua">frozen_changes</span></strong>&#8203;<span class="gre en">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed 909 git reup = rebase-update</code></pre>
836 * <strong><span class="red">4b0c180</span></strong> <span class="yellow"> 2014-03-12</span> ~ modfile
837 * <strong><span class="red">59a7cca</span></strong> <span class="yellow"> 2014-03-12</span> ~ a deleted file
838 * <strong><span class="red">6bec695</span></strong> <span class="green">( </span>&#8203;<span class="red">origin/master</span>&#8203;<span class="green">) </span> <span class="yellow">2014-03-11</span> ~ Add neat feature
839 * <strong><span class="red">d15a38a</span></strong> <span class="yellow"> 2014-03-11</span> ~ Epic README update
840 * <strong><span class="red">d559894</span></strong> <span class="green">( </span>&#8203;<strong><span class="lime">master</span></strong>&#8203;<span clas s="green">)</span> <span class="yellow">2014-03-11</span> ~ Important upstream c hange
841 <span class="red">|</span> * <strong><span class="red">9c311fd</span></strong> <span class="green">(</span>&#8203;<strong><span class="lime">cool_feature</ span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-1 1</span> ~ Respond to CL comments
842 <span class="red">|</span> <span class="green">|</span> * <strong><span class="r ed">2a1eeb2</span></strong> <span class="green">(</span>&#8203;<strong><span class="lime">subfeature</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ integrate with CoolService
843 <span class="red">|</span> <span class="green">|</span> * <strong><span class="r ed">d777af6</span></strong> <span class="yellow">2014-03-11</span> ~ slick co mmenting action
844 <span class="red">|</span> <span class="green">|/</span>
845 <span class="red">|</span> * <strong><span class="red">265803a</span></strong> <span class="yellow">2014-03-11</span> ~ another improvement
846 <span class="red">|</span> * <strong><span class="red">6d831ac</span></strong> <span class="green">(</span>&#8203;<strong><span class="fuchsia">spleen_tag< /span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03- 11</span> ~ Refactor spleen
847 <span class="red">|</span> * <strong><span class="red">82e74ab</span></strong> <span class="yellow">2014-03-11</span> ~ Add widget
848 <span class="red">|/</span>
849 * <strong><span class="red">d08c5b3</span></strong> <span class="green">( </span>&#8203;<strong><span class="lime">bogus_noparent</span></strong>&#8203;<s pan class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful be ginnings</code></pre>
850 </div></div> 910 </div></div>
851 <div class="paragraph"><p>As you can see, the structure of the commit history is visible, particularly
852 what the parents of each commit are. In order to see the <em>upstream</em>
853 relationships of the branches (i.e. which branch is tracking which other
854 branch), use the <a href="git-map-branches.html">git-map-branches(1)</a> command .</p></div>
855 </div> 911 </div>
856 </div> 912 </div>
857 <div class="sect1"> 913 <div class="sect1">
858 <h2 id="_see_also">SEE ALSO</h2> 914 <h2 id="_see_also">SEE ALSO</h2>
859 <div class="sectionbody"> 915 <div class="sectionbody">
860 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a ></p></div> 916 <div class="paragraph"><p><a href="git-new-branch.html">git-new-branch(1)</a>, < a href="git-reparent-branch.html">git-reparent-branch(1)</a>,
917 <a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream -diff.html">git-upstream-diff(1)</a>,
918 <a href="git-freeze.html">git-freeze(1)</a>, <a href="git-mark-merge-base.html"> git-mark-merge-base(1)</a></p></div>
861 </div> 919 </div>
862 </div> 920 </div>
863 <div class="sect1"> 921 <div class="sect1">
864 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 922 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
865 <div class="sectionbody"> 923 <div class="sectionbody">
866 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 924 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to
867 assist with the development of chromium and related projects. Download the tools 925 assist with the development of chromium and related projects. Download the tools
868 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 926 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
869 </div> 927 </div>
870 </div> 928 </div>
871 </div> 929 </div>
872 <div id="footnotes"><hr /></div> 930 <div id="footnotes"><hr /></div>
873 <div id="footer"> 931 <div id="footer">
874 <div id="footer-text"> 932 <div id="footer-text">
875 Last updated 2014-03-14 14:01:55 PDT 933 Last updated 2014-03-23 02:58:06 PDT
876 </div> 934 </div>
877 </div> 935 </div>
878 </body> 936 </body>
879 </html> 937 </html>
OLDNEW
« docs/html/git-freeze.html ('K') | « docs/html/git-new-branch.html ('k') | docs/html/git-rename-branch.html » ('j') | docs/src/git-new-branch.txt » ('J')

Powered by Google App Engine
This is Rietveld 408576698