| OLD | NEW |
| (Empty) |
| 1 '\" t | |
| 2 .\" Title: git-squash-branch | |
| 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] | |
| 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> | |
| 5 .\" Date: 04/10/2014 | |
| 6 .\" Manual: Chromium depot_tools Manual | |
| 7 .\" Source: depot_tools 68b1017 | |
| 8 .\" Language: English | |
| 9 .\" | |
| 10 .TH "GIT\-SQUASH\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot
_tools Manual" | |
| 11 .\" ----------------------------------------------------------------- | |
| 12 .\" * Define some portability stuff | |
| 13 .\" ----------------------------------------------------------------- | |
| 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
| 15 .\" http://bugs.debian.org/507673 | |
| 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html | |
| 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
| 18 .ie \n(.g .ds Aq \(aq | |
| 19 .el .ds Aq ' | |
| 20 .\" ----------------------------------------------------------------- | |
| 21 .\" * set default formatting | |
| 22 .\" ----------------------------------------------------------------- | |
| 23 .\" disable hyphenation | |
| 24 .nh | |
| 25 .\" disable justification (adjust text to left margin only) | |
| 26 .ad l | |
| 27 .\" ----------------------------------------------------------------- | |
| 28 .\" * MAIN CONTENT STARTS HERE * | |
| 29 .\" ----------------------------------------------------------------- | |
| 30 .SH "NAME" | |
| 31 git-squash-branch \- Takes all commits in a single branch and replaces them with
a single commit\&. | |
| 32 .SH "SYNOPSIS" | |
| 33 .sp | |
| 34 .nf | |
| 35 \fIgit squash\-branch\fR [\-m <message>] | |
| 36 .fi | |
| 37 .sp | |
| 38 .SH "DESCRIPTION" | |
| 39 .sp | |
| 40 git squash\-branch is a simple helper command\&. It takes all the commits on the
current branch from the \fImerge_base\fR to HEAD, and reduces them to a single
commit\&. The new commit will contain a summary of all the commits which were sq
uashed, preceeded by a header message indicating that it\(cqs the result of a sq
uash (or the message you pass on the command line\&.)\&. | |
| 41 .sp | |
| 42 Squashing branches is useful when trying to rebase\-update over branches which w
ere pushed to their upsteram (or committed by the \fICommit Queue\fR), and then
conflicting changes landed in upstream on top of the push/commit\&. If you know
that your branch was committed but \fBgit-rebase-update\fR(1) isn\(cqt able to a
utomatically clean it, you can squash the troublesome branch before git rebase\-
update, and then when git rebase\-update presents the conflict, you can verify t
hat the conflict diff is what you expected (and then skip it with git rebase \-\
-skip)\&. | |
| 43 .SH "OPTIONS" | |
| 44 .PP | |
| 45 \-m <message>, \-\-message=<message> | |
| 46 .RS 4 | |
| 47 Optional message to use for the first line of the squashed commit\&. If omitted,
it defaults to "git squash commit\&."\&. | |
| 48 .RE | |
| 49 .SH "EXAMPLE" | |
| 50 .sp | |
| 51 | |
| 52 .sp | |
| 53 .if n \{\ | |
| 54 .RS 4 | |
| 55 .\} | |
| 56 .nf | |
| 57 \fB$ git map\fR | |
| 58 \fB* d0fb9c7 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed | |
| 59 * \fBf48f415 \fR 2014\-04\-10 ~ modfile | |
| 60 * \fB4c5b9c0 \fR 2014\-04\-10 ~ a deleted file | |
| 61 * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen
_branch)\fR | |
| 62 * \fB3726937 \fR 2014\-04\-10 ~ Epic README update | |
| 63 | * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments | |
| 64 | | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo
lService | |
| 65 | | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action | |
| 66 | |/ | |
| 67 | * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR | |
| 68 | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | |
| 69 | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget | |
| 70 |/ | |
| 71 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(cool_feature, fixit)\fR | |
| 72 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds | |
| 73 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. | |
| 74 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. | |
| 75 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView | |
| 76 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path | |
| 77 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder
r | |
| 78 \fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR | |
| 79 \fB$ git map\fR | |
| 80 \fB* 98e69e8 \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo | |
| 81 * \fBf7ce1e4 \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen
_branch)\fR | |
| 82 * \fB3726937 \fR 2014\-04\-10 ~ Epic README update | |
| 83 | * \fB14db2e5 \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments | |
| 84 | | * \fBee3f972 \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo
lService | |
| 85 | | * \fB4f9f508 \fR 2014\-04\-10 ~ slick commenting action | |
| 86 | |/ | |
| 87 | * \fB7d84f85 \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR | |
| 88 | * \fB27abea4 \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | |
| 89 | * \fBd8abe73 \fR 2014\-04\-10 ~ Add widget | |
| 90 |/ | |
| 91 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(cool_feature, fixit)\fR | |
| 92 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds | |
| 93 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. | |
| 94 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. | |
| 95 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView | |
| 96 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path | |
| 97 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder
r | |
| 98 .fi | |
| 99 .if n \{\ | |
| 100 .RE | |
| 101 .\} | |
| 102 .sp | |
| 103 .SH "SUGGESTED ALIASES" | |
| 104 .sp | |
| 105 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
fig\fR file\&. | |
| 106 .sp | |
| 107 .if n \{\ | |
| 108 .RS 4 | |
| 109 .\} | |
| 110 .nf | |
| 111 [alias] | |
| 112 git squash = squash\-branch | |
| 113 .fi | |
| 114 .if n \{\ | |
| 115 .RE | |
| 116 .\} | |
| 117 .sp | |
| 118 .SH "SEE ALSO" | |
| 119 .sp | |
| 120 \fBgit-rebase-update\fR(1) | |
| 121 .SH "CHROMIUM DEPOT_TOOLS" | |
| 122 .sp | |
| 123 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi
st with the development of chromium and related projects\&. Download the tools f
rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. | |
| 124 .SH "NOTES" | |
| 125 .IP " 1." 4 | |
| 126 here | |
| 127 .RS 4 | |
| 128 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | |
| 129 .RE | |
| OLD | NEW |