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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1331263002: Add a --keep-going flag for people who run rebase-update infrequently. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Fix typo. Created 5 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
« no previous file with comments | « git_rebase_update.py ('k') | man/man1/git-rebase-update.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-rebase-update(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
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 <p>git-rebase-update - 748 <p>git-rebase-update -
749 Updates all branches to have the latest changes from their upstreams. 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 rebase-update</em> [-v | --verbose] [-n | --no_fetc h]</pre> 758 <pre class="content"><em>git rebase-update</em> [-v | --verbose] [-n | --no-fetc h] [-k | --keep-going]</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>Brings all branches up-to-date with their tracking bra nches. This involves 766 <div class="paragraph"><p>Brings all branches up-to-date with their tracking bra nches. This involves
767 several phases:</p></div> 767 several phases:</p></div>
768 <div class="dlist"><dl> 768 <div class="dlist"><dl>
(...skipping 10 matching lines...) Expand all
779 </dd> 779 </dd>
780 <dt class="hdlist1"> 780 <dt class="hdlist1">
781 Fetching 781 Fetching
782 </dt> 782 </dt>
783 <dd> 783 <dd>
784 <p> 784 <p>
785 All branches are examined to find their upstream references. The correct set 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 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. 787 branches have a tag as their upstream, we are forced to pull all remotes.
788 </p> 788 </p>
789 <div class="paragraph"><p>Pass <code>--no_fetch</code> to skip this phase.</p></ div> 789 <div class="paragraph"><p>Pass <code>--no-fetch</code> to skip this phase.</p></ div>
790 </dd> 790 </dd>
791 <dt class="hdlist1"> 791 <dt class="hdlist1">
792 Rebasing 792 Rebasing
793 </dt> 793 </dt>
794 <dd> 794 <dd>
795 <p> 795 <p>
796 All branches are rebased in topological order from roots (upstreams) to 796 All branches are rebased in topological order from roots (upstreams) to
797 leaves. Each branch is rebased from its marked merge-base (see <em>CONFIGURAT ION 797 leaves. Each branch is rebased from its marked merge-base (see <em>CONFIGURAT ION
798 VARIABLES</em>) to the branch tip on top of its parent branch. If the parent 798 VARIABLES</em>) to the branch tip on top of its parent branch. If the parent
799 branch is <em>frozen</em> (see <a href="git-freeze.html">git-freeze(1)</a>), t he branch will be rebased 799 branch is <em>frozen</em> (see <a href="git-freeze.html">git-freeze(1)</a>), t he branch will be rebased
800 onto the last non-freeze commit on the parent branch. 800 onto the last non-freeze commit on the parent branch.
801 </p> 801 </p>
802 <div class="paragraph"><p>Things get interesting when there are merge conflicts on rebase. The <strong>most 802 <div class="paragraph"><p>Things get interesting when there are merge conflicts on rebase. The <strong>most
803 common</strong> cause for conflicts is when your branch has been committed to th e 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 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 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 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> 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 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 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> 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> 811 again to pick up where you left off.</p></div>
812 </dd> 812 </dd>
813 </dl></div>
814 <div class="paragraph"><p>If you&#8217;d like to rebase all rebaseable branches in one pass and manually process
815 the unrebaseable ones later, use -k or --keep-going. Cleanup will not happen
816 until all branches apply cleanly.</p></div>
817 <div class="dlist"><dl>
813 <dt class="hdlist1"> 818 <dt class="hdlist1">
814 Cleanup 819 Cleanup
815 </dt> 820 </dt>
816 <dd> 821 <dd>
817 <p> 822 <p>
818 Once all the branches have been rebased, any empty branches (i.e. branches 823 Once all the branches have been rebased, any empty branches (i.e. branches
819 with no commits on them) are removed. If a branch is removed in this fashion, 824 with no commits on them) are removed. If a branch is removed in this fashion,
820 any branches which depend on it are reparented to the parent of the removed 825 any branches which depend on it are reparented to the parent of the removed
821 branch (see <a href="git-reparent-branch.html">git-reparent-branch(1)</a>). 826 branch (see <a href="git-reparent-branch.html">git-reparent-branch(1)</a>).
822 </p> 827 </p>
(...skipping 14 matching lines...) Expand all
837 </div> 842 </div>
838 </div> 843 </div>
839 <div class="sect1"> 844 <div class="sect1">
840 <h2 id="_options">OPTIONS</h2> 845 <h2 id="_options">OPTIONS</h2>
841 <div class="sectionbody"> 846 <div class="sectionbody">
842 <div class="dlist"><dl> 847 <div class="dlist"><dl>
843 <dt class="hdlist1"> 848 <dt class="hdlist1">
844 -n 849 -n
845 </dt> 850 </dt>
846 <dt class="hdlist1"> 851 <dt class="hdlist1">
847 --no_fetch 852 --no-fetch
848 </dt> 853 </dt>
849 <dd> 854 <dd>
850 <p> 855 <p>
851 Skip the <code>git fetch</code> phase of rebase-update. 856 Skip the <code>git fetch</code> phase of rebase-update.
852 </p> 857 </p>
853 </dd> 858 </dd>
854 <dt class="hdlist1"> 859 <dt class="hdlist1">
855 -v 860 -v
856 </dt> 861 </dt>
857 <dt class="hdlist1"> 862 <dt class="hdlist1">
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 <div class="sectionbody"> 928 <div class="sectionbody">
924 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 929 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
925 assist with the development of chromium and related projects. Download the tools 930 assist with the development of chromium and related projects. Download the tools
926 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 931 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
927 </div> 932 </div>
928 </div> 933 </div>
929 </div> 934 </div>
930 <div id="footnotes"><hr /></div> 935 <div id="footnotes"><hr /></div>
931 <div id="footer"> 936 <div id="footer">
932 <div id="footer-text"> 937 <div id="footer-text">
933 Last updated 2014-04-10 14:23:11 PDT 938 Last updated 2015-09-10 16:42:50 PDT
934 </div> 939 </div>
935 </div> 940 </div>
936 </body> 941 </body>
937 </html> 942 </html>
OLDNEW
« no previous file with comments | « git_rebase_update.py ('k') | man/man1/git-rebase-update.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698