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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-squash-branch.html

Issue 225433003: Add a basic tutorial for the tools in depot_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@git_map
Patch Set: pylint Created 6 years, 8 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 | « docs/html/git-reparent-branch.html ('k') | docs/html/git-thaw.html » ('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-squash-branch(1)</title> 7 <title>git-squash-branch(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 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 Optional message to use for the first line of the squashed commit. If omitted, 793 Optional message to use for the first line of the squashed commit. If omitted,
794 it defaults to "git squash commit.". 794 it defaults to "git squash commit.".
795 </p> 795 </p>
796 </dd> 796 </dd>
797 </dl></div> 797 </dl></div>
798 </div> 798 </div>
799 </div> 799 </div>
800 <div class="sect1"> 800 <div class="sect1">
801 <h2 id="_example">EXAMPLE</h2> 801 <h2 id="_example">EXAMPLE</h2>
802 <div class="sectionbody"> 802 <div class="sectionbody">
803 <div class="listingblock"> 803 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span>
804 <div class="content"> 804 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1 6; background-color: #492ee1">a8f0220 </span><span style="color: #19c518"> (</ span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style= "font-weight: bold"></span><span style="color: #19c518">) </span><span style="co lor: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
805 <pre><code><strong><span class="white">$ git map</span></strong> 805 * <span style="font-weight: bold; color: #e42e16">c382556 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ mod file
806 <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 806 * <span style="font-weight: bold; color: #e42e16">06e399f </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a d eleted file
807 * <strong><span class="red">4b0c180</span></strong> <span class="yellow"> 2014-03-12</span> ~ modfile 807 * <span style="font-weight: bold; color: #e42e16">20494d2 </span><span sty le="color: #19c518"> (</span><span style="color: #19c518"></span><span style="fo nt-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></s pan><span style="font-weight: bold"></span><span style="color: #19c518">) </span ><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="f ont-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt ;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font- weight: bold"></span>
808 * <strong><span class="red">59a7cca</span></strong> <span class="yellow"> 2014-03-12</span> ~ a deleted file 808 * <span style="font-weight: bold; color: #e42e16">f734bbf </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epi c README update
809 * <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 <strong><sp an class="white">&lt;(frozen_changes)</span></strong> 809 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">983a7b8 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</s pan><span style="font-weight: bold"></span><span style="font-weight: bold"></spa n><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10< /span> ~ Respond to CL comments
810 * <strong><span class="red">d15a38a</span></strong> <span class="yellow"> 2014-03-11</span> ~ Epic README update 810 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s pan style="font-weight: bold; color: #e42e16">2f53c1f </span><span style="colo r: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weigh t: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span ><span style="font-weight: bold"></span><span style="color: #19c518">) </span><s pan style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
811 * <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 811 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s pan style="font-weight: bold; color: #e42e16">b4e5087 </span><span style="colo r: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick comme nting action
812 <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 812 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
813 <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 813 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">ac10591 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"> </span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</spa n><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
814 <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 814 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">088691d </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</spa n><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</s pan> ~ Refactor spleen
815 <span class="red">|</span> <span class="green">|/</span> 815 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">206ceb2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
816 <span class="red">|</span> * <strong><span class="red">265803a</span></strong> <span class="yellow">2014-03-11</span> ~ another improvement <strong><spa n class="white">&lt;(subfeature)</span></strong> 816 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
817 <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 817 * <span style="font-weight: bold; color: #e42e16">619ccc9 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</ span><span style="font-weight: bold"></span><span style="font-weight: bold"></sp an>
818 <span class="red">|</span> * <strong><span class="red">82e74ab</span></strong> <span class="yellow">2014-03-11</span> ~ Add widget 818 * <span style="font-weight: bold; color: #e42e16">40b838e </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds
819 <span class="red">|/</span> 819 * <span style="font-weight: bold; color: #e42e16">65db351 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager.
820 * <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 <strong><span class="white">&lt;(cool_feature)</span></strong> 820 * <span style="font-weight: bold; color: #e42e16">c1923e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar.
821 <strong><span class="white">$ git squash-branch "cool squash demo"</span></stron g> 821 * <span style="font-weight: bold; color: #e42e16">ccaca03 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView
822 <strong><span class="white">$ git map</span></strong> 822 * <span style="font-weight: bold; color: #e42e16">9b1c1ab </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path
823 <span class="white blue-background">*</span>&#8203;<strong><span class="blue-bac kground red"> 2c81508 </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-22</span> ~ cool squash demo 823 * <span style="font-weight: bold; color: #e42e16">a91bbf9 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr
824 * <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 <strong><sp an class="white">&lt;(frozen_changes)</span></strong> 824 <span style="font-weight: bold; color: #ffffff">$ git squash-branch -m 'cool squ ash demo'</span>
825 * <strong><span class="red">d15a38a</span></strong> <span class="yellow"> 2014-03-11</span> ~ Epic README update 825 <span style="font-weight: bold; color: #ffffff">$ git map</span>
826 * <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 826 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1 6; background-color: #492ee1">5b451bd </span><span style="color: #19c518"> (</ span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">frozen_branch</span><span style="font-weight: bold"></span><span style= "font-weight: bold"></span><span style="color: #19c518">) </span><span style="co lor: #e7e71c">2014-04-10</span> ~ cool squash demo
827 <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 827 * <span style="font-weight: bold; color: #e42e16">20494d2 </span><span sty le="color: #19c518"> (</span><span style="color: #19c518"></span><span style="fo nt-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></s pan><span style="font-weight: bold"></span><span style="color: #19c518">) </span ><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="f ont-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt ;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font- weight: bold"></span>
828 <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 828 * <span style="font-weight: bold; color: #e42e16">f734bbf </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epi c README update
829 <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 829 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">983a7b8 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">cool_feature</s pan><span style="font-weight: bold"></span><span style="font-weight: bold"></spa n><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10< /span> ~ Respond to CL comments
830 <span class="red">|</span> <span class="green">|/</span> 830 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s pan style="font-weight: bold; color: #e42e16">2f53c1f </span><span style="colo r: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weigh t: bold; color: #19c518">subfeature</span><span style="font-weight: bold"></span ><span style="font-weight: bold"></span><span style="color: #19c518">) </span><s pan style="color: #e7e71c">2014-04-10</span> ~ integrate with CoolService
831 <span class="red">|</span> * <strong><span class="red">265803a</span></strong> <span class="yellow">2014-03-11</span> ~ another improvement <strong><spa n class="white">&lt;(subfeature)</span></strong> 831 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s pan style="font-weight: bold; color: #e42e16">b4e5087 </span><span style="colo r: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick comme nting action
832 <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 832 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span style="color: #19c518">/</span>
833 <span class="red">|</span> * <strong><span class="red">82e74ab</span></strong> <span class="yellow">2014-03-11</span> ~ Add widget 833 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">ac10591 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ another improvement<span style="font-weight: bold"> </span><span style="font-weight: bold; color: #ffffff"> &lt;(subfeature)</spa n><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
834 <span class="red">|/</span> 834 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">088691d </span><span style="color: #19c518"> (</span><span style="color: #d338d3"></span><span style="font-weight: bold; color: #d338d3">spleen_tag</spa n><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</s pan> ~ Refactor spleen
835 * <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 <strong><span class="white">&lt;(cool_feature)</span></strong></code ></pre> 835 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">206ceb2 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add widget
836 </div></div> 836 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
837 * <span style="font-weight: bold; color: #e42e16">619ccc9 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(cool_feature, fixit)</ span><span style="font-weight: bold"></span><span style="font-weight: bold"></sp an>
838 * <span style="font-weight: bold; color: #e42e16">40b838e </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds
839 * <span style="font-weight: bold; color: #e42e16">65db351 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager.
840 * <span style="font-weight: bold; color: #e42e16">c1923e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar.
841 * <span style="font-weight: bold; color: #e42e16">ccaca03 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView
842 * <span style="font-weight: bold; color: #e42e16">9b1c1ab </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path
843 * <span style="font-weight: bold; color: #e42e16">a91bbf9 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr
844 </code></pre></div></div><p><div class="paragraph"></p></div>
837 </div> 845 </div>
838 </div> 846 </div>
839 <div class="sect1"> 847 <div class="sect1">
840 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> 848 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
841 <div class="sectionbody"> 849 <div class="sectionbody">
842 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em> 850 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
843 file.</p></div> 851 file.</p></div>
844 <div class="listingblock"> 852 <div class="listingblock">
845 <div class="content"> 853 <div class="content">
846 <pre><code>[alias] 854 <pre><code>[alias]
847 git squash = squash-branch</code></pre> 855 git squash = squash-branch</code></pre>
848 </div></div> 856 </div></div>
849 </div> 857 </div>
850 </div> 858 </div>
851 <div class="sect1"> 859 <div class="sect1">
852 <h2 id="_see_also">SEE ALSO</h2> 860 <h2 id="_see_also">SEE ALSO</h2>
853 <div class="sectionbody"> 861 <div class="sectionbody">
854 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)< /a></p></div> 862 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)< /a></p></div>
855 </div> 863 </div>
856 </div> 864 </div>
857 <div class="sect1"> 865 <div class="sect1">
858 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 866 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
859 <div class="sectionbody"> 867 <div class="sectionbody">
860 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 868 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
861 assist with the development of chromium and related projects. Download the tools 869 assist with the development of chromium and related projects. Download the tools
862 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 870 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
863 </div> 871 </div>
864 </div> 872 </div>
865 </div> 873 </div>
866 <div id="footnotes"><hr /></div> 874 <div id="footnotes"><hr /></div>
867 <div id="footer"> 875 <div id="footer">
868 <div id="footer-text"> 876 <div id="footer-text">
869 Last updated 2014-03-25 15:09:11 PDT 877 Last updated 2014-04-10 14:23:11 PDT
870 </div> 878 </div>
871 </div> 879 </div>
872 </body> 880 </body>
873 </html> 881 </html>
OLDNEW
« no previous file with comments | « docs/html/git-reparent-branch.html ('k') | docs/html/git-thaw.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698