| OLD | NEW |
|---|
| 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-branches(1)</title> | 7 <title>git-map-branches(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 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 766 <div class="paragraph"><p>Git map-branches displays all local branches such that
:</p></div> | 766 <div class="paragraph"><p>Git map-branches displays all local branches such that
:</p></div> |
| 767 <div class="ulist"><ul> | 767 <div class="ulist"><ul> |
| 768 <li> | 768 <li> |
| 769 <p> | 769 <p> |
| 770 Current branch is <span class="aqua">cyan</span>. | 770 Current branch is <span class="aqua">cyan</span>. |
| 771 </p> | 771 </p> |
| 772 <div class="ulist"><ul> | 772 <div class="ulist"><ul> |
| 773 <li> | 773 <li> |
| 774 <p> | 774 <p> |
| 775 The branch which will be modified with git-commit is denoted with an asterisk | 775 The branch which will be modified with git-commit is denoted with an asterisk |
| 776 (<code>*</code>) after the name. | 776 (<code>*</code>) after the name. |
| 777 </p> | 777 </p> |
| 778 </li> | 778 </li> |
| 779 </ul></div> | 779 </ul></div> |
| 780 </li> | 780 </li> |
| 781 <li> | 781 <li> |
| 782 <p> | 782 <p> |
| 783 Local branches are <span class="green">green</span>. | 783 Local branches are <span class="green">green</span>. |
| 784 </p> | 784 </p> |
| 785 </li> | 785 </li> |
| 786 <li> | 786 <li> |
| 787 <p> | 787 <p> |
| 788 Remote branches are <span class="red">red</span> (usually, the root of all other
branches). | 788 Remote branches are <span class="red">red</span> (usually, the root of all other
branches). |
| 789 </p> | 789 </p> |
| 790 </li> | 790 </li> |
| 791 <li> | 791 <li> |
| 792 <p> | 792 <p> |
| 793 <code>{NO UPSTREAM}</code> is a special placeholder in <span class="fuchsia">mag
enta</span>. | 793 <code>{NO UPSTREAM}</code> is a special placeholder in <span class="fuchsia">mag
enta</span>. |
| 794 </p> | 794 </p> |
| 795 <div class="ulist"><ul> | 795 <div class="ulist"><ul> |
| 796 <li> | 796 <li> |
| 797 <p> | 797 <p> |
| 798 Branches which have this as their parent are usually misconfigured, and | 798 Branches which have this as their parent are usually misconfigured, and |
| 799 should be assigned a parent by checking out the branch and running git
branch | 799 should be assigned a parent by checking out the branch and running git branch |
| 800 --set-upstream-to=<correct parent branch>. | 800 --set-upstream-to=<correct parent branch>. |
| 801 </p> | 801 </p> |
| 802 </li> | 802 </li> |
| 803 </ul></div> | 803 </ul></div> |
| 804 </li> | 804 </li> |
| 805 </ul></div> | 805 </ul></div> |
| 806 <div class="admonitionblock"> | 806 <div class="admonitionblock"> |
| 807 <table><tr> | 807 <table><tr> |
| 808 <td class="icon"> | 808 <td class="icon"> |
| 809 <div class="title">Note</div> | 809 <div class="title">Note</div> |
| 810 </td> | 810 </td> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 827 <span class="green">subfeature</span> | 827 <span class="green">subfeature</span> |
| 828 <span class="aqua">frozen_changes *</span> | 828 <span class="aqua">frozen_changes *</span> |
| 829 <span class="green">master</span> | 829 <span class="green">master</span> |
| 830 <span class="fuchsia">{NO UPSTREAM}</span> | 830 <span class="fuchsia">{NO UPSTREAM}</span> |
| 831 <span class="green">bogus_noparent</span> | 831 <span class="green">bogus_noparent</span> |
| 832 <span class="aqua">duplicate_cool_feature_no_upstream</span></code></pre> | 832 <span class="aqua">duplicate_cool_feature_no_upstream</span></code></pre> |
| 833 </div></div> | 833 </div></div> |
| 834 </div> | 834 </div> |
| 835 </div> | 835 </div> |
| 836 <div class="sect1"> | 836 <div class="sect1"> |
| 837 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> |
| 838 <div class="sectionbody"> |
| 839 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these
to your <em>~/.gitconfig</em> |
| 840 file.</p></div> |
| 841 <div class="listingblock"> |
| 842 <div class="content"> |
| 843 <pre><code>[alias] |
| 844 git bmap = map-branches</code></pre> |
| 845 </div></div> |
| 846 </div> |
| 847 </div> |
| 848 <div class="sect1"> |
| 837 <h2 id="_see_also">SEE ALSO</h2> | 849 <h2 id="_see_also">SEE ALSO</h2> |
| 838 <div class="sectionbody"> | 850 <div class="sectionbody"> |
| 839 <div class="paragraph"><p><a href="git-map.html">git-map(1)</a></p></div> | 851 <div class="paragraph"><p><a href="git-map.html">git-map(1)</a></p></div> |
| 840 </div> | 852 </div> |
| 841 </div> | 853 </div> |
| 842 <div class="sect1"> | 854 <div class="sect1"> |
| 843 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> | 855 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> |
| 844 <div class="sectionbody"> | 856 <div class="sectionbody"> |
| 845 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(1)</a> suite. These tools are meant to | 857 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(1)</a> suite. These tools are meant to |
| 846 assist with the development of chromium and related projects. Download the tools | 858 assist with the development of chromium and related projects. Download the tools |
| 847 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> | 859 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> |
| 848 </div> | 860 </div> |
| 849 </div> | 861 </div> |
| 850 </div> | 862 </div> |
| 851 <div id="footnotes"><hr /></div> | 863 <div id="footnotes"><hr /></div> |
| 852 <div id="footer"> | 864 <div id="footer"> |
| 853 <div id="footer-text"> | 865 <div id="footer-text"> |
| 854 Last updated 2014-03-14 14:01:10 PDT | 866 Last updated 2014-03-25 15:09:11 PDT |
| 855 </div> | 867 </div> |
| 856 </div> | 868 </div> |
| 857 </body> | 869 </body> |
| 858 </html> | 870 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 184253003:
Add git-reup and friends (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw