docs/html/git-squash-branch.html - Issue 184253003: Add git-reup and friends

Side by Side Diff: docs/html/git-squash-branch.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

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(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

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 Loading...
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-squash-branch(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-squash-branch -

749 Display history of all branches in a colorized terminal format.	749 Takes all commits in a single branch and replaces them with a single commit.

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> [<extra_args>…]</pre>	758 <pre class="content"><em>git squash-branch</em> [<header message>]</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><code>git squash-branch</code> is a simple helper comm and. It takes all the commits on the

767 <div class="ulist"><ul>	767 current branch from the <em>merge_base</em> to HEAD, and reduces them to a singl e

768 <li>	768 commit. The new commit will contain a summary of all the commits which were

769 <p>	769 squashed, preceeded by an optional header message.</p></div>

770 Current branch is <span class="aqua">cyan</span>.	770 <div class="paragraph"><p>Squashing branches is useful when trying to rebase-upd ate over branches which

771 </p>	771 were pushed to their upsteram (or committed by the <em>Commit Queue</em>), and t hen

772 </li>	772 conflicting changes landed in upstream on top of the push/commit. If you know

773 <li>	773 that your branch was committed but <a href="git-rebase-update.html">git-rebase-u pdate(1)</a> isn’t able to

774 <p>	774 automatically clean it, you can squash the troublesome branch before <code>git

775 Local branches are <span class="green">green</span>.	775 rebase-update</code>, and then when <code>git rebase-update</code> presents the conflict, you can

776 </p>	776 verify that the conflict diff is what you expected (and then skip it with

777 </li>	777 <code>git rebase --skip</code>).</p></div>

778 <li>

779 <p>

780 Remote branches are <span class="red">red</span>.

781 </p>

782 </li>

783 <li>

784 <p>

785 Tags are <span class="fuchsia">magenta</span>.

786 </p>

787 </li>

788 <li>

789 <p>

790 The currently checked out commit is highlighted with a <span class="yellow blue- background">blue background</span>.

791 </p>

792 </li>

793 </ul></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>	778 </div>

797 </div>	779 </div>

798 <div class="sect1">	780 <div class="sect1">

799 <h2 id="_options">OPTIONS</h2>	781 <h2 id="_options">OPTIONS</h2>

800 <div class="sectionbody">	782 <div class="sectionbody">

801 <div class="dlist"><dl>	783 <div class="dlist"><dl>

802 <dt class="hdlist1">	784 <dt class="hdlist1">

803 <extra_args>…	785 <header message>

804 </dt>	786 </dt>

805 <dd>	787 <dd>

806 <p>	788 <p>

807 Extra parameters to pass to the internal <a href="git-log.html">git-log( 1)</a> invocation. This	789 Optional message to use for the first line of the squashed commit. If om itted,

808 can be used to restrict what refs <em>git map</em> operates on, etc.	790 it defaults to "git squash commit.".

809 </p>	791 </p>

810 <div class="paragraph"><p>If you run git map with a series of fixed arguments fr equently, you can use

811 the depot_tools.map_extra configuration variable to pre-set arguments (See

812 <code>CONFIGURATION VARIABLES</code>)</p></div>

813 </dd>	792 </dd>

814 </dl></div>	793 </dl></div>

815 </div>	794 </div>

816 </div>	795 </div>

817 <div class="sect1">	796 <div class="sect1">

818 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>

819 <div class="sectionbody">

820 <div class="sect2">

821 <h3 id="_depot_tools_map_extra">depot_tools.map_extra</h3>

822 <div class="paragraph"><p>Each value of the <em>depot_tools.map_extra</em> confi g variable is applied as an

823 additional argument to <code>git log</code> during the execution of git map. If you wish to

824 configure this, use git <code>config --add depot_tools.map_extra <value></ code> to do so.</p></div>

825 </div>

826 </div>

827 </div>

828 <div class="sect1">

829 <h2 id="_example">EXAMPLE</h2>	797 <h2 id="_example">EXAMPLE</h2>

830 <div class="sectionbody">	798 <div class="sectionbody">

831 <div class="paragraph"><p>Running <em>git map</em> would result in an output som ething like:</p></div>

832 <div class="listingblock">	799 <div class="listingblock">

833 <div class="content">	800 <div class="content">

834 <pre><code><strong><span class="white">$ git map</span></strong>	801 <pre><code><strong><span class="white">$ git map</span></strong>

835 <span class="white blue-background">*</span><strong><span class="blue-bac kground red"> 7dcfe47 </span></strong> <span class="green">(</span> <strong><span class="aqua">frozen_changes</span></strong><span class="gre en">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed	802 <span class="white blue-background">*</span><strong><span class="blue-bac kground red"> 7dcfe47 </span></strong> <span class="green">(</span> <strong><span class="aqua">frozen_changes</span></strong><span class="gre en">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed

836 * <strong><span class="red">4b0c180</span></strong> <span class="yellow"> 2014-03-12</span> ~ modfile	803 * <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	804 * <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><span class="red">origin/master</span><span class="green">) </span> <span class="yellow">2014-03-11</span> ~ Add neat feature	805 * <strong><span class="red">6bec695</span></strong> <span class="green">( </span><span class="red">origin/master</span><span class="green">) </span> <span class="yellow">2014-03-11</span> ~ Add neat feature <strong><sp an class="white"><(frozen_changes)</span></strong>

839 * <strong><span class="red">d15a38a</span></strong> <span class="yellow"> 2014-03-11</span> ~ Epic README update	806 * <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><strong><span class="lime">master</span></strong><span clas s="green">)</span> <span class="yellow">2014-03-11</span> ~ Important upstream c hange	807 * <strong><span class="red">d559894</span></strong> <span class="green">( </span><strong><span class="lime">master</span></strong><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><strong><span class="lime">cool_feature</ span></strong><span class="green">)</span> <span class="yellow">2014-03-1 1</span> ~ Respond to CL comments	808 <span class="red">\|</span> * <strong><span class="red">9c311fd</span></strong> <span class="green">(</span><strong><span class="lime">cool_feature</ span></strong><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><strong><span class="lime">subfeature</span></strong><span class="green">)</span> <span class="yellow">2014-03-11</span> ~ integrate with CoolService	809 <span class="red">\|</span> <span class="green">\|</span> * <strong><span class="r ed">2a1eeb2</span></strong> <span class="green">(</span><strong><span class="lime">subfeature</span></strong><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	810 <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>	811 <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	812 <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"><(subfeature)</span></strong>

846 <span class="red">\|</span> * <strong><span class="red">6d831ac</span></strong> <span class="green">(</span><strong><span class="fuchsia">spleen_tag< /span></strong><span class="green">)</span> <span class="yellow">2014-03- 11</span> ~ Refactor spleen	813 <span class="red">\|</span> * <strong><span class="red">6d831ac</span></strong> <span class="green">(</span><strong><span class="fuchsia">spleen_tag< /span></strong><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	814 <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>	815 <span class="red">\|/</span>

849 * <strong><span class="red">d08c5b3</span></strong> <span class="green">( </span><strong><span class="lime">bogus_noparent</span></strong><s pan class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful be ginnings</code></pre>	816 * <strong><span class="red">d08c5b3</span></strong> <span class="green">( </span><strong><span class="lime">bogus_noparent</span></strong><s pan class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful be ginnings <strong><span class="white"><(cool_feature)</span></strong>

	817 <strong><span class="white">$ git squash-branch "cool squash demo"</span></stron g>

	818 <strong><span class="white">$ git map</span></strong>

	819 <span class="white blue-background">*</span><strong><span class="blue-bac kground red"> 2c81508 </span></strong> <span class="green">(</span> <strong><span class="aqua">frozen_changes</span></strong><span class="gre en">)</span> <span class="yellow">2014-03-22</span> ~ cool squash demo

	820 * <strong><span class="red">6bec695</span></strong> <span class="green">( </span><span class="red">origin/master</span><span class="green">) </span> <span class="yellow">2014-03-11</span> ~ Add neat feature <strong><sp an class="white"><(frozen_changes)</span></strong>

	821 * <strong><span class="red">d15a38a</span></strong> <span class="yellow"> 2014-03-11</span> ~ Epic README update

	822 * <strong><span class="red">d559894</span></strong> <span class="green">( </span><strong><span class="lime">master</span></strong><span clas s="green">)</span> <span class="yellow">2014-03-11</span> ~ Important upstream c hange

	823 <span class="red">\|</span> * <strong><span class="red">9c311fd</span></strong> <span class="green">(</span><strong><span class="lime">cool_feature</ span></strong><span class="green">)</span> <span class="yellow">2014-03-1 1</span> ~ Respond to CL comments

	824 <span class="red">\|</span> <span class="green">\|</span> * <strong><span class="r ed">2a1eeb2</span></strong> <span class="green">(</span><strong><span class="lime">subfeature</span></strong><span class="green">)</span> <span class="yellow">2014-03-11</span> ~ integrate with CoolService

	825 <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

	826 <span class="red">\|</span> <span class="green">\|/</span>

	827 <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"><(subfeature)</span></strong>

	828 <span class="red">\|</span> * <strong><span class="red">6d831ac</span></strong> <span class="green">(</span><strong><span class="fuchsia">spleen_tag< /span></strong><span class="green">)</span> <span class="yellow">2014-03- 11</span> ~ Refactor spleen

	829 <span class="red">\|</span> * <strong><span class="red">82e74ab</span></strong> <span class="yellow">2014-03-11</span> ~ Add widget

	830 <span class="red">\|/</span>

	831 * <strong><span class="red">d08c5b3</span></strong> <span class="green">( </span><strong><span class="lime">bogus_noparent</span></strong><s pan class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful be ginnings <strong><span class="white"><(cool_feature)</span></strong></code ></pre>

850 </div></div>	832 </div></div>

851 <div class="paragraph"><p>As you can see, the structure of the commit history is visible, particularly	833 </div>

852 what the parents of each commit are. In order to see the <em>upstream</em>	834 </div>

853 relationships of the branches (i.e. which branch is tracking which other	835 <div class="sect1">

854 branch), use the <a href="git-map-branches.html">git-map-branches(1)</a> command .</p></div>	836 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>

	837 <div class="sectionbody">

	838 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>

	839 file.</p></div>

	840 <div class="listingblock">

	841 <div class="content">

	842 <pre><code>[alias]

	843 git squash = squash-branch</code></pre>

	844 </div></div>

855 </div>	845 </div>

856 </div>	846 </div>

857 <div class="sect1">	847 <div class="sect1">

858 <h2 id="_see_also">SEE ALSO</h2>	848 <h2 id="_see_also">SEE ALSO</h2>

859 <div class="sectionbody">	849 <div class="sectionbody">

860 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a ></p></div>	850 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)< /a></p></div>

861 </div>	851 </div>

862 </div>	852 </div>

863 <div class="sect1">	853 <div class="sect1">

864 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>	854 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>

865 <div class="sectionbody">	855 <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	856 <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	857 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>	858 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>

869 </div>	859 </div>

870 </div>	860 </div>

871 </div>	861 </div>

872 <div id="footnotes"><hr /></div>	862 <div id="footnotes"><hr /></div>

873 <div id="footer">	863 <div id="footer">

874 <div id="footer-text">	864 <div id="footer-text">

875 Last updated 2014-03-14 14:01:55 PDT	865 Last updated 2014-03-23 00:29:05 PDT

876 </div>	866 </div>

877 </div>	867 </div>

878 </body>	868 </body>

879 </html>	869 </html>

OLD	NEW

« docs/html/git-freeze.html ('K') | « docs/html/git-reparent-branch.html ('k') | docs/html/git-thaw.html » ('j') | docs/src/git-new-branch.txt » ('J')