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

Side by Side Diff: docs/man1/git-squash-branch.1

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/man1/git-reparent-branch.1 ('k') | docs/man1/git-thaw.1 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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: 03/25/2014 5 .\" Date: 04/10/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools 207bff1 7 .\" Source: depot_tools 68b1017
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-SQUASH\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot _tools Manual" 10 .TH "GIT\-SQUASH\-BRANCH" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot _tools Manual"
11 .\" ----------------------------------------------------------------- 11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff 12 .\" * Define some portability stuff
13 .\" ----------------------------------------------------------------- 13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673 15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq 18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq ' 19 .el .ds Aq '
20 .\" ----------------------------------------------------------------- 20 .\" -----------------------------------------------------------------
(...skipping 20 matching lines...) Expand all
41 .sp 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)\&. 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" 43 .SH "OPTIONS"
44 .PP 44 .PP
45 \-m <message>, \-\-message=<message> 45 \-m <message>, \-\-message=<message>
46 .RS 4 46 .RS 4
47 Optional message to use for the first line of the squashed commit\&. If omitted, it defaults to "git squash commit\&."\&. 47 Optional message to use for the first line of the squashed commit\&. If omitted, it defaults to "git squash commit\&."\&.
48 .RE 48 .RE
49 .SH "EXAMPLE" 49 .SH "EXAMPLE"
50 .sp 50 .sp
51
52 .sp
51 .if n \{\ 53 .if n \{\
52 .RS 4 54 .RS 4
53 .\} 55 .\}
54 .nf 56 .nf
55 \fB$ git map\fR 57 \fB$ git map\fR
56 *\:\fB 7dcfe47 \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-12 ~ FREEZE\&.unin dexed 58 \fB* a8f0220» \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
57 * \fB4b0c180\fR 2014\-03\-12 ~ modfile 59 * \fBc382556» \fR 2014\-04\-10 ~ modfile
58 * \fB59a7cca\fR 2014\-03\-12 ~ a deleted file 60 * \fB06e399f» \fR 2014\-04\-10 ~ a deleted file
59 * \fB6bec695\fR (\:origin/master\:) 2014\-03\-11 ~ Add neat feature \f B<(frozen_changes)\fR 61 * \fB20494d2» \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen _branch)\fR
60 * \fBd15a38a\fR 2014\-03\-11 ~ Epic README update 62 * \fBf734bbf» \fR 2014\-04\-10 ~ Epic README update
61 * \fBd559894\fR (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream chan ge 63 | * \fB983a7b8» \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
62 | * \fB9c311fd\fR (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL com ments 64 | | * \fB2f53c1f» \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo lService
63 | | * \fB2a1eeb2\fR (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with Cool Service 65 | | * \fBb4e5087» \fR 2014\-04\-10 ~ slick commenting action
64 | | * \fBd777af6\fR 2014\-03\-11 ~ slick commenting action
65 | |/ 66 | |/
66 | * \fB265803a\fR 2014\-03\-11 ~ another improvement \fB<(subfeature)\fR 67 | * \fBac10591» \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
67 | * \fB6d831ac\fR (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen 68 | * \fB088691d» \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
68 | * \fB82e74ab\fR 2014\-03\-11 ~ Add widget 69 | * \fB206ceb2» \fR 2014\-04\-10 ~ Add widget
69 |/ 70 |/
70 * \fBd08c5b3\fR (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful begin nings \fB<(cool_feature)\fR 71 * \fB619ccc9» \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(cool_feature, fixit)\fR
71 \fB$ git squash\-branch "cool squash demo"\fR 72 * \fB40b838e» \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\&.
74 * \fBc1923e0» \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
76 * \fB9b1c1ab» \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
77 * \fBa91bbf9» \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r
78 \fB$ git squash\-branch \-m \*(Aqcool squash demo\*(Aq\fR
72 \fB$ git map\fR 79 \fB$ git map\fR
73 *\:\fB 2c81508 \fR (\:\fBfrozen_changes\fR\:) 2014\-03\-22 ~ cool squash d emo 80 \fB* 5b451bd» \fR (\fBfrozen_branch\fR) 2014\-04\-10 ~ cool squash demo
74 * \fB6bec695\fR (\:origin/master\:) 2014\-03\-11 ~ Add neat feature \f B<(frozen_changes)\fR 81 * \fB20494d2» \fR (\fBfixit\fR) 2014\-04\-10 ~ Add neat feature\fB <(frozen _branch)\fR
75 * \fBd15a38a\fR 2014\-03\-11 ~ Epic README update 82 * \fBf734bbf» \fR 2014\-04\-10 ~ Epic README update
76 * \fBd559894\fR (\:\fBmaster\fR\:) 2014\-03\-11 ~ Important upstream chan ge 83 | * \fB983a7b8» \fR (\fBcool_feature\fR) 2014\-04\-10 ~ Respond to CL comments
77 | * \fB9c311fd\fR (\:\fBcool_feature\fR\:) 2014\-03\-11 ~ Respond to CL com ments 84 | | * \fB2f53c1f» \fR (\fBsubfeature\fR) 2014\-04\-10 ~ integrate with Coo lService
78 | | * \fB2a1eeb2\fR (\:\fBsubfeature\fR\:) 2014\-03\-11 ~ integrate with Cool Service 85 | | * \fBb4e5087» \fR 2014\-04\-10 ~ slick commenting action
79 | | * \fBd777af6\fR 2014\-03\-11 ~ slick commenting action
80 | |/ 86 | |/
81 | * \fB265803a\fR 2014\-03\-11 ~ another improvement \fB<(subfeature)\fR 87 | * \fBac10591» \fR 2014\-04\-10 ~ another improvement\fB <(subfeature)\fR
82 | * \fB6d831ac\fR (\:\fBspleen_tag\fR\:) 2014\-03\-11 ~ Refactor spleen 88 | * \fB088691d» \fR (\fBspleen_tag\fR) 2014\-04\-10 ~ Refactor spleen
83 | * \fB82e74ab\fR 2014\-03\-11 ~ Add widget 89 | * \fB206ceb2» \fR 2014\-04\-10 ~ Add widget
84 |/ 90 |/
85 * \fBd08c5b3\fR (\:\fBbogus_noparent\fR\:) 2014\-03\-11 ~ Wonderful begin nings \fB<(cool_feature)\fR 91 * \fB619ccc9» \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
93 * \fB65db351» \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\&.
95 * \fBccaca03» \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView
96 * \fB9b1c1ab» \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
97 * \fBa91bbf9» \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r
86 .fi 98 .fi
87 .if n \{\ 99 .if n \{\
88 .RE 100 .RE
89 .\} 101 .\}
90 .sp 102 .sp
91 .SH "SUGGESTED ALIASES" 103 .SH "SUGGESTED ALIASES"
92 .sp 104 .sp
93 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\&.
94 .sp 106 .sp
95 .if n \{\ 107 .if n \{\
96 .RS 4 108 .RS 4
97 .\} 109 .\}
98 .nf 110 .nf
99 [alias] 111 [alias]
100 git squash = squash\-branch 112 git squash = squash\-branch
101 .fi 113 .fi
102 .if n \{\ 114 .if n \{\
103 .RE 115 .RE
104 .\} 116 .\}
105 .sp 117 .sp
106 .SH "SEE ALSO" 118 .SH "SEE ALSO"
107 .sp 119 .sp
108 \fBgit-rebase-update\fR(1) 120 \fBgit-rebase-update\fR(1)
109 .SH "CHROMIUM DEPOT_TOOLS" 121 .SH "CHROMIUM DEPOT_TOOLS"
110 .sp 122 .sp
111 Part of the chromium \fBdepot_tools\fR(1) 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\&.
112 .SH "NOTES" 124 .SH "NOTES"
113 .IP " 1." 4 125 .IP " 1." 4
114 here 126 here
115 .RS 4 127 .RS 4
116 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 128 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
117 .RE 129 .RE
OLDNEW
« no previous file with comments | « docs/man1/git-reparent-branch.1 ('k') | docs/man1/git-thaw.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698