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-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 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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="paragraph"><p></p></div><div class="listingblock"><div class="conten
t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span> | 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 <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">d0fb9c7» </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 | 804 * <span style="font-weight: bold; color: #e42e16">d0fb9c7» </span><span sty
le="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> frozen_bran
ch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014
-04-10</span> ~ FREEZE.unindexed |
805 * <span style="font-weight: bold; color: #e42e16">f48f415 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ mod
file | 805 * <span style="font-weight: bold; color: #e42e16">f48f415 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ mod
file |
806 * <span style="font-weight: bold; color: #e42e16">4c5b9c0 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a d
eleted file | 806 * <span style="font-weight: bold; color: #e42e16">4c5b9c0 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a d
eleted file |
807 * <span style="font-weight: bold; color: #e42e16">f7ce1e4 </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"> <
;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-
weight: bold"></span> | 807 * <span style="font-weight: bold; color: #e42e16">f7ce1e4 </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"> <
;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-
weight: bold"></span> |
808 * <span style="font-weight: bold; color: #e42e16">3726937 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epi
c README update | 808 * <span style="font-weight: bold; color: #e42e16">3726937 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epi
c README update |
809 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">14db2e5 </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 | 809 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">14db2e5 </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 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">ee3f972 </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 | 810 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">ee3f972 </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 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">4f9f508 </span><span style="colo
r: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick comme
nting action | 811 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">4f9f508 </span><span style="colo
r: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick comme
nting action |
812 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span
style="color: #19c518">/</span> | 812 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span
style="color: #19c518">/</span> |
813 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">7d84f85 </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"> <(subfeature)</spa
n><span style="font-weight: bold"></span><span style="font-weight: bold"></span> | 813 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">7d84f85 </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"> <(subfeature)</spa
n><span style="font-weight: bold"></span><span style="font-weight: bold"></span> |
814 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">27abea4 </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 | 814 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">27abea4 </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 style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">d8abe73 </span><span style="color: #19c518"></span> <span style="color:
#e7e71c">2014-04-10</span> ~ Add widget | 815 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">d8abe73 </span><span style="color: #19c518"></span> <span style="color:
#e7e71c">2014-04-10</span> ~ Add widget |
816 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> | 816 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> |
817 * <span style="font-weight: bold; color: #e42e16">beec6f4 </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"> <(cool_feature, fixit)</
span><span style="font-weight: bold"></span><span style="font-weight: bold"></sp
an> | 817 * <span style="font-weight: bold; color: #e42e16">beec6f4 </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"> <(cool_feature, fixit)</
span><span style="font-weight: bold"></span><span style="font-weight: bold"></sp
an> |
818 * <span style="font-weight: bold; color: #e42e16">41290e0 </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 | 818 * <span style="font-weight: bold; color: #e42e16">41290e0 </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 style="font-weight: bold; color: #e42e16">a76fde7 </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. | 819 * <span style="font-weight: bold; color: #e42e16">a76fde7 </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 * <span style="font-weight: bold; color: #e42e16">9de7a71 </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. | 820 * <span style="font-weight: bold; color: #e42e16">9de7a71 </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 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con
tentView->ContentViewCore in ContentViewRenderView | 821 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con
tentView->ContentViewCore in ContentViewRenderView |
822 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo
ne: evdev: Filter devices by path | 822 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo
ne: evdev: Filter devices by path |
823 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw
ays output seccomp error messages to stderr | 823 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw
ays output seccomp error messages to stderr |
824 <span style="font-weight: bold; color: #ffffff">$ git squash-branch -m 'cool squ
ash demo'</span> | 824 <span style="font-weight: bold; color: #ffffff">$ git squash-branch -m 'cool squ
ash demo'</span> |
825 <span style="font-weight: bold; color: #ffffff">$ git map</span> | 825 <span style="font-weight: bold; color: #ffffff">$ git map</span> |
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">98e69e8» </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 | 826 * <span style="font-weight: bold; color: #e42e16">98e69e8» </span><span sty
le="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> frozen_bran
ch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014
-04-10</span> ~ cool squash demo |
827 * <span style="font-weight: bold; color: #e42e16">f7ce1e4 </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"> <
;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-
weight: bold"></span> | 827 * <span style="font-weight: bold; color: #e42e16">f7ce1e4 </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"> <
;(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-
weight: bold"></span> |
828 * <span style="font-weight: bold; color: #e42e16">3726937 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epi
c README update | 828 * <span style="font-weight: bold; color: #e42e16">3726937 </span><span sty
le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Epi
c README update |
829 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">14db2e5 </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 | 829 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">14db2e5 </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 style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">ee3f972 </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 | 830 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">ee3f972 </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 style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">4f9f508 </span><span style="colo
r: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick comme
nting action | 831 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span> * <s
pan style="font-weight: bold; color: #e42e16">4f9f508 </span><span style="colo
r: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ slick comme
nting action |
832 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span
style="color: #19c518">/</span> | 832 <span style="color: #e42e16">|</span> <span style="color: #19c518">|</span><span
style="color: #19c518">/</span> |
833 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">7d84f85 </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"> <(subfeature)</spa
n><span style="font-weight: bold"></span><span style="font-weight: bold"></span> | 833 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">7d84f85 </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"> <(subfeature)</spa
n><span style="font-weight: bold"></span><span style="font-weight: bold"></span> |
834 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">27abea4 </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 | 834 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">27abea4 </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 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">d8abe73 </span><span style="color: #19c518"></span> <span style="color:
#e7e71c">2014-04-10</span> ~ Add widget | 835 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #
e42e16">d8abe73 </span><span style="color: #19c518"></span> <span style="color:
#e7e71c">2014-04-10</span> ~ Add widget |
836 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> | 836 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> |
(...skipping 23 matching lines...) Expand all Loading... |
860 <h2 id="_see_also">SEE ALSO</h2> | 860 <h2 id="_see_also">SEE ALSO</h2> |
861 <div class="sectionbody"> | 861 <div class="sectionbody"> |
862 <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> |
863 </div> | 863 </div> |
864 </div> | 864 </div> |
865 <div class="sect1"> | 865 <div class="sect1"> |
866 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> | 866 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> |
867 <div class="sectionbody"> | 867 <div class="sectionbody"> |
868 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(7)</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 |
869 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 |
870 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">here
</a>.</p></div> |
871 </div> | 871 </div> |
872 </div> | 872 </div> |
873 </div> | 873 </div> |
874 <div id="footnotes"><hr /></div> | 874 <div id="footnotes"><hr /></div> |
875 <div id="footer"> | 875 <div id="footer"> |
876 <div id="footer-text"> | 876 <div id="footer-text"> |
877 Last updated 2014-04-10 14:23:11 PDT | 877 Last updated 2016-07-21 10:09:00 PDT |
878 </div> | 878 </div> |
879 </div> | 879 </div> |
880 </body> | 880 </body> |
881 </html> | 881 </html> |
OLD | NEW |