aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update depot_tools documentation for squash-closed

Browse Source 
Fixed: 395115987
Change-Id: Ia6d27144e9cc0e8156affbafc7c481cfe048813a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6287829
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
Auto-Submit: Alexander Cooper <alcooper@chromium.org>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
changes/29/6287829/3
Alexander Cooper 7 days ago committed by LUCI CQ
parent 2259aa1766
commit 5c7e9a0782
40 changed files with 124 additions and 83 deletions
Show Stats Download Patch File Download Diff File

2
man/html/depot_tools.html
Unescape Escape View File

@ -920,7 +920,7 @@ Print a diff of the current branch, compared to its upstream.
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

12
man/html/depot_tools_tutorial.html
Unescape Escape View File

@ -1097,6 +1097,16 @@ then <code>git rebase-update</code> will clean it up for you.</p></div>
rebase-update</code>, and it will pick up where it left off. Once the command has
finished updating all of your branches, it will return you back to the branch
you started on.</p></div>
<div class="paragraph"><p>As an alternative, or if you experience issues with multiple merge conflicts on
the same changes you can run <code>git squash-branch</code> on the conflicted branch
(either after running <code>git rebase --abort</code> or before running <code>git
rebase-update</code>). This will convert the branch to a single commit, which should
apply more cleanly, or at least result in only needing to resolve the merge
conflicts once. Running <code>git cl squash-closed</code> prior to <code>git rebase-update</code> will
perform this <code>git squash-branch</code> on all branches that gerrit thinks are closed.
These now-closed branches should have a single commit that will cleanly apply
(and then subsequently be deleted by the rebase process), and can reduce the
risk of running into merge conflicts during the rebase.</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
@ -1628,7 +1638,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

10
man/html/git-cl.html
Unescape Escape View File

@ -902,6 +902,14 @@ presubmit
</p>
</dd>
<dt class="hdlist1">
squash-closed
</dt>
<dd>
<p>
runs <code>git squash-branch</code> on all branches associated with closed changelists
</p>
</dd>
<dt class="hdlist1">
set-close
</dt>
<dd>
@ -1028,7 +1036,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-footers.html
Unescape Escape View File

@ -877,7 +877,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

6
man/html/git-freeze.html
Unescape Escape View File

@ -794,7 +794,7 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
<span style="font-weight: bold; color: #BFBFBF">$ git status --short</span>
<span style="font-weight: bold; color: #BFBFBF">$ git log -n 2 --stat</span>
<span style="color: #F1FA8C">commit f879ba5dc5c9ca32736938865f85e0d257bc3a0e</span>
<span style="color: #F1FA8C">commit c6dbdcb1f59cc61d7d7a8d907714f522921028d2</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
@ -806,7 +806,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 <span style="color: #FF5555">-</span>
4 files changed, 2 insertions(+), 1 deletion(-)
<span style="color: #F1FA8C">commit 1288ea0739d12aa67b785a672769bd6edf483666</span>
<span style="color: #F1FA8C">commit db8b1e90a83f18f6edfe663414ec4abb099a8804</span>
Author: local &lt;local@chromium.org&gt;
Date: Thu Apr 10 08:54:56 2014 +0000
@ -859,7 +859,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-hyper-blame.html
Unescape Escape View File

@ -873,7 +873,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-map-branches.html
Unescape Escape View File

@ -901,7 +901,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

4
man/html/git-map.html
Unescape Escape View File

@ -849,7 +849,7 @@ configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</
<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF79C6"></span><span style="font-weight: bold; color: #FF79C6">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor spleen
<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ Add widget
<span style="color: #FF5555">|</span><span style="color: #FF5555">/</span>
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">fixit, cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">cool_feature, fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
@ -882,7 +882,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-mark-merge-base.html
Unescape Escape View File

@ -821,7 +821,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-nav-downstream.html
Unescape Escape View File

@ -843,7 +843,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-nav-upstream.html
Unescape Escape View File

@ -853,7 +853,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-new-branch.html
Unescape Escape View File

@ -972,7 +972,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-rebase-update.html
Unescape Escape View File

@ -973,7 +973,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-rename-branch.html
Unescape Escape View File

@ -789,7 +789,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-reparent-branch.html
Unescape Escape View File

@ -842,7 +842,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-retry.html
Unescape Escape View File

@ -853,7 +853,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

4
man/html/git-squash-branch.html
Unescape Escape View File

@ -815,7 +815,7 @@ verify that the conflict diff is what you expected (and then skip it with
<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">27abea4b40</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF79C6"></span><span style="font-weight: bold; color: #FF79C6">spleen_tag</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Refactor spleen
<span style="color: #FF5555">|</span> * <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">d8abe739e3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ Add widget
<span style="color: #FF5555">|</span><span style="color: #FF5555">/</span>
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">cool_feature, fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">beec6f4746</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">(</span><span style="font-weight: bold; color: #FF5555">origin/main</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">, </span><span style="font-weight: bold; color: #FF5555">origin/HEAD</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #50FA7B"></span><span style="font-weight: bold; color: #50FA7B">) </span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #F1FA8C">2014-04-10</span> ~ Make ReflectorImpl use mailboxes &lt;(<span style="color: #BFBFBF"></span><span style="font-weight: bold; color: #BFBFBF">fixit, cool_feature</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>)
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">41290e02b7</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">a76fde7b7b</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
* <span style="color: #FF5555"></span><span style="font-weight: bold; color: #FF5555">9de7a713b3</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> <span style="color: #F1FA8C">2014-04-10</span> ~ linux_aura: Use system configuration for middle clicking the titlebar.
@ -878,7 +878,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-thaw.html
Unescape Escape View File

@ -789,7 +789,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

2
man/html/git-upstream-diff.html
Unescape Escape View File

@ -918,7 +918,7 @@ by checking out the <a href="https://chromium.googlesource.com/chromium/tools/de
<div id="footer">
<div id="footer-text">
Last updated
2025-02-18 06:58:12 UTC
2025-02-20 16:05:41 PST
</div>
</div>
</body>

13
man/man1/git-cl.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-cl
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-CL" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-CL" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -122,6 +122,13 @@ presubmit
runs presubmit tests on the current changelist
.RE
.PP
squash\-closed
.RS 4
runs
\fBgit squash\-branch\fR
on all branches associated with closed changelists
.RE
.PP
set\-close
.RS 4
closes the issue

6
man/man1/git-footers.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-footers
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-FOOTERS" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-FOOTERS" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

10
man/man1/git-freeze.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-freeze
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-FREEZE" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-FREEZE" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -63,7 +63,7 @@ D deleted_file
\fB$ git status \-\-short\fR
\fB$ git log \-n 2 \-\-stat\fR
commit 99b93ff68bad103a5fc79292f6d4e9f9d843bec8
commit dfe24b962f4994c628938662dc2ff5802163313f
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000
@ -75,7 +75,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
unstaged_deleted_file | 1 \-
4 files changed, 2 insertions(+), 1 deletion(\-)
commit 8823cc046c2cd02dac18d409c7f62ade8a1b98a3
commit 2e8f1ac75f5a7c2ac28d3a22677d59724e3cbcb1
Author: local <local@chromium\&.org>
Date: Thu Apr 10 08:54:56 2014 +0000

6
man/man1/git-hyper-blame.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-hyper-blame
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-HYPER\-BLAME" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-HYPER\-BLAME" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-map-branches.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-map-branches
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-MAP\-BRANCHES" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-MAP\-BRANCHES" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-map.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-map
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-MAP" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-MAP" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-mark-merge-base.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-mark-merge-base
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-MARK\-MERGE\-BA" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-MARK\-MERGE\-BA" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-nav-downstream.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-nav-downstream
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-DOWNSTREAM" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-nav-upstream.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-nav-upstream
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-NAV\-UPSTREAM" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-NAV\-UPSTREAM" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-new-branch.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-new-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-NEW\-BRANCH" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-NEW\-BRANCH" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-rebase-update.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-rebase-update
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-REBASE\-UPDATE" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-REBASE\-UPDATE" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-rename-branch.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-rename-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-RENAME\-BRANCH" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-RENAME\-BRANCH" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-reparent-branch.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-reparent-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-REPARENT\-BRANC" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-REPARENT\-BRANC" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-retry.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-retry
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-RETRY" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-RETRY" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

8
man/man1/git-squash-branch.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-squash-branch
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-SQUASH\-BRANCH" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-SQUASH\-BRANCH" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -68,7 +68,7 @@ Optional message to use for the first line of the squashed commit\&. If omitted,
| * \fB27abea4b40\fR \fB(spleen_tag\fR\fB) \fR2014\-04\-10 ~ Refactor spleen
| * \fBd8abe739e3\fR 2014\-04\-10 ~ Add widget
|/
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBcool_feature, fixit\fR)
* \fBbeec6f4746\fR \fB(origin/main\fR\fB, origin/HEAD\fR\fB) \fR2014\-04\-10 ~ Make ReflectorImpl use mailboxes <(\fBfixit, cool_feature\fR)
* \fB41290e02b7\fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
* \fBa76fde7b7b\fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together with the request manager\&.
* \fB9de7a713b3\fR 2014\-04\-10 ~ linux_aura: Use system configuration for middle clicking the titlebar\&.

6
man/man1/git-thaw.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-thaw
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-THAW" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-THAW" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man1/git-upstream-diff.1
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: git-upstream-diff
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "GIT\-UPSTREAM\-DIFF" "1" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "GIT\-UPSTREAM\-DIFF" "1" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

6
man/man7/depot_tools.7
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: depot_tools
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "DEPOT_TOOLS" "7" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS" "7" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

8
man/man7/depot_tools_tutorial.7
Unescape Escape View File

@ -2,12 +2,12 @@
.\" Title: depot_tools_tutorial
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 02/18/2025
.\" Date: 02/20/2025
.\" Manual: Chromium depot_tools Manual
.\" Source: depot_tools 6cf251b5
.\" Source: depot_tools 8a5ec2b9
.\" Language: English
.\"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "02/18/2025" "depot_tools 6cf251b5" "Chromium depot_tools Manual"
.TH "DEPOT_TOOLS_TUTORIAL" "7" "02/20/2025" "depot_tools 8a5ec2b9" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -407,6 +407,8 @@ One thing to look out for are \fImerge conflicts\fR\&. These happen for exactly
Sometimes you\(cqre pretty certain that you\(cqve committed a certain branch, but \fBgit rebase\-update\fR isn\(cqt able to tell that for sure\&. This is usually because your branch doesn\(cqt rebase cleanly\&. You could just delete the branch with \fBgit branch \-D <branch>\fR, but you\(cqd like to double check the diff of your branch against its upstream before deleting it\&. If this is the case you can abort the rebase started by \fBgit rebase\-update\fR, and then run \fBgit-squash-branch\fR(1) to flatten your branch into a single commit\&. When you run \fBgit rebase\-update\fR again, you\(cqll get a (hopefully) much smaller / saner diff\&. If it turns out you were wrong about your branch being fully committed, you can use \fBgit-reflog\fR(1) to reset your branch back to where it was before\&. If the diff looks inconsequential, you can use \fBgit rebase \-\-skip\fR to ignore it, and then \fBgit rebase\-update\fR will clean it up for you\&.
.sp
Once you\(cqre done resolving all of the merge conflict, just run \fBgit rebase\-update\fR, and it will pick up where it left off\&. Once the command has finished updating all of your branches, it will return you back to the branch you started on\&.
.sp
As an alternative, or if you experience issues with multiple merge conflicts on the same changes you can run \fBgit squash\-branch\fR on the conflicted branch (either after running \fBgit rebase \-\-abort\fR or before running \fBgit rebase\-update\fR)\&. This will convert the branch to a single commit, which should apply more cleanly, or at least result in only needing to resolve the merge conflicts once\&. Running \fBgit cl squash\-closed\fR prior to \fBgit rebase\-update\fR will perform this \fBgit squash\-branch\fR on all branches that gerrit thinks are closed\&. These now\-closed branches should have a single commit that will cleanly apply (and then subsequently be deleted by the rebase process), and can reduce the risk of running into merge conflicts during the rebase\&.
.if n \{\
.sp
.\}

11
man/src/depot_tools_tutorial.txt
Unescape Escape View File

@ -281,6 +281,17 @@ rebase-update`, and it will pick up where it left off. Once the command has
finished updating all of your branches, it will return you back to the branch
you started on.
As an alternative, or if you experience issues with multiple merge conflicts on
the same changes you can run `git squash-branch` on the conflicted branch
(either after running `git rebase --abort` or before running `git
rebase-update`). This will convert the branch to a single commit, which should
apply more cleanly, or at least result in only needing to resolve the merge
conflicts once. Running `git cl squash-closed` prior to `git rebase-update` will
perform this `git squash-branch` on all branches that gerrit thinks are closed.
These now-closed branches should have a single commit that will cleanly apply
(and then subsequently be deleted by the rebase process), and can reduce the
risk of running into merge conflicts during the rebase.
[NOTE]
Running `git rebase-update` will update all your branches, but it will not
automatically run `gclient sync` to update your dependencies. Use caution when

3
man/src/git-cl.txt
Unescape Escape View File

@ -70,6 +70,9 @@ patch::
presubmit::
runs presubmit tests on the current changelist
squash-closed::
runs `git squash-branch` on all branches associated with closed changelists
set-close::
closes the issue

Write Preview
Loading…
Cancel
Save