| OLD | NEW |
| 1 '\" t | 1 '\" t |
| 2 .\" Title: git-squash-branch | 2 .\" Title: git-squash-branch |
| 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] | 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
| 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> | 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> |
| 5 .\" Date: 04/10/2014 | 5 .\" Date: 04/10/2014 |
| 6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
| 7 .\" Source: depot_tools 68b1017 | 7 .\" Source: depot_tools 68b1017 |
| 8 .\" Language: English | 8 .\" Language: English |
| 9 .\" | 9 .\" |
| 10 .TH "GIT\-SQUASH\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot
_tools Manual" | 10 .TH "GIT\-SQUASH\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot
_tools Manual" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 .RE | 48 .RE |
| 49 .SH "EXAMPLE" | 49 .SH "EXAMPLE" |
| 50 .sp | 50 .sp |
| 51 | 51 |
| 52 .sp | 52 .sp |
| 53 .if n \{\ | 53 .if n \{\ |
| 54 .RS 4 | 54 .RS 4 |
| 55 .\} | 55 .\} |
| 56 .nf | 56 .nf |
| 57 \fB$ git map\fR | 57 \fB$ git map\fR |
| 58 \fB* a8f0220» \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed | 58 \fB* d0fb9c7» \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed |
| 59 * \fBc382556» \fR 2014\-04\-10 ~ modfile | 59 * \fBf48f415» \fR 2014\-04\-10 ~ modfile |
| 60 * \fB06e399f» \fR 2014\-04\-10 ~ a deleted file | 60 * \fB4c5b9c0» \fR 2014\-04\-10 ~ a deleted file |
| 61 * \fB20494d2» \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen
_branch)\fR | 61 * \fBf7ce1e4» \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen
_branch)\fR |
| 62 * \fBf734bbf» \fR 2014\-04\-10 ~ Epic README update | 62 * \fB3726937» \fR 2014\-04\-10 ~ Epic README update |
| 63 | * \fB983a7b8» \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments | 63 | * \fB14db2e5» \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments |
| 64 | | * \fB2f53c1f» \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo
lService | 64 | | * \fBee3f972» \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo
lService |
| 65 | | * \fBb4e5087» \fR 2014\-04\-10 ~ slick commenting action | 65 | | * \fB4f9f508» \fR 2014\-04\-10 ~ slick commenting action |
| 66 | |/ | 66 | |/ |
| 67 | * \fBac10591» \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR | 67 | * \fB7d84f85» \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR |
| 68 | * \fB088691d» \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | 68 | * \fB27abea4» \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen |
| 69 | * \fB206ceb2» \fR 2014\-04\-10 ~ Add widget | 69 | * \fBd8abe73» \fR 2014\-04\-10 ~ Add widget |
| 70 |/ | 70 |/ |
| 71 * \fB619ccc9» \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(cool_feature, fixit)\fR | 71 * \fBbeec6f4» \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(cool_feature, fixit)\fR |
| 72 * \fB40b838e» \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds | 72 * \fB41290e0» \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds |
| 73 * \fB65db351» \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. | 73 * \fBa76fde7» \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. |
| 74 * \fBc1923e0» \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. | 74 * \fB9de7a71» \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. |
| 75 * \fBccaca03» \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView | 75 * \fB073b0c2» \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView |
| 76 * \fB9b1c1ab» \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path | 76 * \fB2250f53» \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path |
| 77 * \fBa91bbf9» \fR 2014\-04\-10 ~ Always output seccomp error messages to stder
r | 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 | 78 \fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR |
| 79 \fB$ git map\fR | 79 \fB$ git map\fR |
| 80 \fB* 5b451bd» \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo | 80 \fB* 98e69e8» \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo |
| 81 * \fB20494d2» \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen
_branch)\fR | 81 * \fBf7ce1e4» \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen
_branch)\fR |
| 82 * \fBf734bbf» \fR 2014\-04\-10 ~ Epic README update | 82 * \fB3726937» \fR 2014\-04\-10 ~ Epic README update |
| 83 | * \fB983a7b8» \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments | 83 | * \fB14db2e5» \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments |
| 84 | | * \fB2f53c1f» \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo
lService | 84 | | * \fBee3f972» \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo
lService |
| 85 | | * \fBb4e5087» \fR 2014\-04\-10 ~ slick commenting action | 85 | | * \fB4f9f508» \fR 2014\-04\-10 ~ slick commenting action |
| 86 | |/ | 86 | |/ |
| 87 | * \fBac10591» \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR | 87 | * \fB7d84f85» \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR |
| 88 | * \fB088691d» \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen | 88 | * \fB27abea4» \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen |
| 89 | * \fB206ceb2» \fR 2014\-04\-10 ~ Add widget | 89 | * \fBd8abe73» \fR 2014\-04\-10 ~ Add widget |
| 90 |/ | 90 |/ |
| 91 * \fB619ccc9» \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(cool_feature, fixit)\fR | 91 * \fBbeec6f4» \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm
pl use mailboxes\fB <(cool_feature, fixit)\fR |
| 92 * \fB40b838e» \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds | 92 * \fB41290e0» \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on
uclibc builds |
| 93 * \fB65db351» \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. | 93 * \fBa76fde7» \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi
th the request manager\&. |
| 94 * \fBc1923e0» \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. | 94 * \fB9de7a71» \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd
le clicking the titlebar\&. |
| 95 * \fBccaca03» \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView | 95 * \fB073b0c2» \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR
enderView |
| 96 * \fB9b1c1ab» \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path | 96 * \fB2250f53» \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path |
| 97 * \fBa91bbf9» \fR 2014\-04\-10 ~ Always output seccomp error messages to stder
r | 97 * \fB33a7a74» \fR 2014\-04\-10 ~ Always output seccomp error messages to stder
r |
| 98 .fi | 98 .fi |
| 99 .if n \{\ | 99 .if n \{\ |
| 100 .RE | 100 .RE |
| 101 .\} | 101 .\} |
| 102 .sp | 102 .sp |
| 103 .SH "SUGGESTED ALIASES" | 103 .SH "SUGGESTED ALIASES" |
| 104 .sp | 104 .sp |
| 105 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
fig\fR file\&. | 105 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
fig\fR file\&. |
| 106 .sp | 106 .sp |
| 107 .if n \{\ | 107 .if n \{\ |
| (...skipping 12 matching lines...) Expand all Loading... |
| 120 \fBgit-rebase-update\fR(1) | 120 \fBgit-rebase-update\fR(1) |
| 121 .SH "CHROMIUM DEPOT_TOOLS" | 121 .SH "CHROMIUM DEPOT_TOOLS" |
| 122 .sp | 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\&. | 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" | 124 .SH "NOTES" |
| 125 .IP " 1." 4 | 125 .IP " 1." 4 |
| 126 here | 126 here |
| 127 .RS 4 | 127 .RS 4 |
| 128 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 128 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
| 129 .RE | 129 .RE |
| OLD | NEW |