diff --git a/man/html/depot_tools.html b/man/html/depot_tools.html index 77d3f8148..a9ff6999c 100644 --- a/man/html/depot_tools.html +++ b/man/html/depot_tools.html @@ -920,7 +920,7 @@ Print a diff of the current branch, compared to its upstream. diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index a23a64236..0ac3272ca 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -1097,6 +1097,16 @@ then git rebase-update will clean it up for you.

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.

@@ -1628,7 +1638,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-cl.html b/man/html/git-cl.html index da6f7ae53..82c8611bd 100644 --- a/man/html/git-cl.html +++ b/man/html/git-cl.html @@ -902,6 +902,14 @@ presubmit

+squash-closed +
+
+

+ runs git squash-branch on all branches associated with closed changelists +

+
+
set-close
@@ -1028,7 +1036,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-footers.html b/man/html/git-footers.html index 86cab7f3b..463dffc57 100644 --- a/man/html/git-footers.html +++ b/man/html/git-footers.html @@ -877,7 +877,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-freeze.html b/man/html/git-freeze.html index a343d3ae6..f2de574dd 100644 --- a/man/html/git-freeze.html +++ b/man/html/git-freeze.html @@ -794,7 +794,7 @@ time you ran git freeze (freshly modified files, new files, etc.).

$ git status --short $ git log -n 2 --stat -commit f879ba5dc5c9ca32736938865f85e0d257bc3a0e +commit c6dbdcb1f59cc61d7d7a8d907714f522921028d2 Author: local <local@chromium.org> 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 - 4 files changed, 2 insertions(+), 1 deletion(-) -commit 1288ea0739d12aa67b785a672769bd6edf483666 +commit db8b1e90a83f18f6edfe663414ec4abb099a8804 Author: local <local@chromium.org> Date: Thu Apr 10 08:54:56 2014 +0000 @@ -859,7 +859,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-hyper-blame.html b/man/html/git-hyper-blame.html index cc352097d..bcebb2e63 100644 --- a/man/html/git-hyper-blame.html +++ b/man/html/git-hyper-blame.html @@ -873,7 +873,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-map-branches.html b/man/html/git-map-branches.html index 706eaa408..23b3c85a6 100644 --- a/man/html/git-map-branches.html +++ b/man/html/git-map-branches.html @@ -901,7 +901,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-map.html b/man/html/git-map.html index 6be4ece42..c22e5c347 100644 --- a/man/html/git-map.html +++ b/man/html/git-map.html @@ -849,7 +849,7 @@ configure this, use git config --add depot-tools.map-extra <value>| * 27abea4b40 (spleen_tag) 2014-04-10 ~ Refactor spleen | * d8abe739e3 2014-04-10 ~ Add widget |/ -* beec6f4746 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(fixit, cool_feature) +* beec6f4746 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(cool_feature, fixit) * 41290e02b7 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds * a76fde7b7b 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager. * 9de7a713b3 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar. @@ -882,7 +882,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-mark-merge-base.html b/man/html/git-mark-merge-base.html index 5fd09b297..9fde369da 100644 --- a/man/html/git-mark-merge-base.html +++ b/man/html/git-mark-merge-base.html @@ -821,7 +821,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-nav-downstream.html b/man/html/git-nav-downstream.html index 92f1eb6d6..80f3dad0c 100644 --- a/man/html/git-nav-downstream.html +++ b/man/html/git-nav-downstream.html @@ -843,7 +843,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-nav-upstream.html b/man/html/git-nav-upstream.html index 1a3a25098..52071cf49 100644 --- a/man/html/git-nav-upstream.html +++ b/man/html/git-nav-upstream.html @@ -853,7 +853,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-new-branch.html b/man/html/git-new-branch.html index fa022e215..76cc3957e 100644 --- a/man/html/git-new-branch.html +++ b/man/html/git-new-branch.html @@ -972,7 +972,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-rebase-update.html b/man/html/git-rebase-update.html index 516ee57dc..09828480a 100644 --- a/man/html/git-rebase-update.html +++ b/man/html/git-rebase-update.html @@ -973,7 +973,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-rename-branch.html b/man/html/git-rename-branch.html index d451f947c..40dea4a49 100644 --- a/man/html/git-rename-branch.html +++ b/man/html/git-rename-branch.html @@ -789,7 +789,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-reparent-branch.html b/man/html/git-reparent-branch.html index 3fac0c6cf..a7d41f8fd 100644 --- a/man/html/git-reparent-branch.html +++ b/man/html/git-reparent-branch.html @@ -842,7 +842,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-retry.html b/man/html/git-retry.html index 8ba5cc93f..5c914a323 100644 --- a/man/html/git-retry.html +++ b/man/html/git-retry.html @@ -853,7 +853,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-squash-branch.html b/man/html/git-squash-branch.html index ac3a8dedc..8fba44806 100644 --- a/man/html/git-squash-branch.html +++ b/man/html/git-squash-branch.html @@ -815,7 +815,7 @@ verify that the conflict diff is what you expected (and then skip it with | * 27abea4b40 (spleen_tag) 2014-04-10 ~ Refactor spleen | * d8abe739e3 2014-04-10 ~ Add widget |/ -* beec6f4746 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(cool_feature, fixit) +* beec6f4746 (origin/main, origin/HEAD) 2014-04-10 ~ Make ReflectorImpl use mailboxes <(fixit, cool_feature) * 41290e02b7 2014-04-10 ~ don't use glibc-specific execinfo.h on uclibc builds * a76fde7b7b 2014-04-10 ~ [fsp] Add requestUnmount() method together with the request manager. * 9de7a713b3 2014-04-10 ~ linux_aura: Use system configuration for middle clicking the titlebar. @@ -878,7 +878,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-thaw.html b/man/html/git-thaw.html index d6e1eb21b..199e0abfa 100644 --- a/man/html/git-thaw.html +++ b/man/html/git-thaw.html @@ -789,7 +789,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/html/git-upstream-diff.html b/man/html/git-upstream-diff.html index ab47976c6..1449ebcde 100644 --- a/man/html/git-upstream-diff.html +++ b/man/html/git-upstream-diff.html @@ -918,7 +918,7 @@ by checking out the
Last updated - 2025-02-18 06:58:12 UTC + 2025-02-20 16:05:41 PST
diff --git a/man/man1/git-cl.1 b/man/man1/git-cl.1 index f589f31b5..5d5538b45 100644 --- a/man/man1/git-cl.1 +++ b/man/man1/git-cl.1 @@ -2,12 +2,12 @@ .\" Title: git-cl .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" 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 diff --git a/man/man1/git-footers.1 b/man/man1/git-footers.1 index c4467427f..1bac7aded 100644 --- a/man/man1/git-footers.1 +++ b/man/man1/git-footers.1 @@ -2,12 +2,12 @@ .\" Title: git-footers .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-freeze.1 b/man/man1/git-freeze.1 index 4ef5381fc..d057e9081 100644 --- a/man/man1/git-freeze.1 +++ b/man/man1/git-freeze.1 @@ -2,12 +2,12 @@ .\" Title: git-freeze .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" 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 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 Date: Thu Apr 10 08:54:56 2014 +0000 diff --git a/man/man1/git-hyper-blame.1 b/man/man1/git-hyper-blame.1 index c7b0c5996..4cb22720d 100644 --- a/man/man1/git-hyper-blame.1 +++ b/man/man1/git-hyper-blame.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-map-branches.1 b/man/man1/git-map-branches.1 index af54e39a4..e8fb30138 100644 --- a/man/man1/git-map-branches.1 +++ b/man/man1/git-map-branches.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-map.1 b/man/man1/git-map.1 index a3d4e5ee2..90523c3c1 100644 --- a/man/man1/git-map.1 +++ b/man/man1/git-map.1 @@ -2,12 +2,12 @@ .\" Title: git-map .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-mark-merge-base.1 b/man/man1/git-mark-merge-base.1 index f25683859..b41f3125d 100644 --- a/man/man1/git-mark-merge-base.1 +++ b/man/man1/git-mark-merge-base.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-nav-downstream.1 b/man/man1/git-nav-downstream.1 index abcdd5f34..fb1208ca4 100644 --- a/man/man1/git-nav-downstream.1 +++ b/man/man1/git-nav-downstream.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-nav-upstream.1 b/man/man1/git-nav-upstream.1 index 719287e33..8c4a991d0 100644 --- a/man/man1/git-nav-upstream.1 +++ b/man/man1/git-nav-upstream.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-new-branch.1 b/man/man1/git-new-branch.1 index 9198087b7..0d15ca9e7 100644 --- a/man/man1/git-new-branch.1 +++ b/man/man1/git-new-branch.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-rebase-update.1 b/man/man1/git-rebase-update.1 index f5c62f59a..fc7e3d9d6 100644 --- a/man/man1/git-rebase-update.1 +++ b/man/man1/git-rebase-update.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-rename-branch.1 b/man/man1/git-rename-branch.1 index ff38aabb8..f84ad465a 100644 --- a/man/man1/git-rename-branch.1 +++ b/man/man1/git-rename-branch.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-reparent-branch.1 b/man/man1/git-reparent-branch.1 index 86441c0ec..29221922d 100644 --- a/man/man1/git-reparent-branch.1 +++ b/man/man1/git-reparent-branch.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-retry.1 b/man/man1/git-retry.1 index 536079046..8db038a65 100644 --- a/man/man1/git-retry.1 +++ b/man/man1/git-retry.1 @@ -2,12 +2,12 @@ .\" Title: git-retry .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-squash-branch.1 b/man/man1/git-squash-branch.1 index 572a88370..5cef594eb 100644 --- a/man/man1/git-squash-branch.1 +++ b/man/man1/git-squash-branch.1 @@ -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 -.\" 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\&. diff --git a/man/man1/git-thaw.1 b/man/man1/git-thaw.1 index a989bf4fe..dca9bb34e 100644 --- a/man/man1/git-thaw.1 +++ b/man/man1/git-thaw.1 @@ -2,12 +2,12 @@ .\" Title: git-thaw .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man1/git-upstream-diff.1 b/man/man1/git-upstream-diff.1 index 13f095fd0..4c5670d1c 100644 --- a/man/man1/git-upstream-diff.1 +++ b/man/man1/git-upstream-diff.1 @@ -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 -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man7/depot_tools.7 b/man/man7/depot_tools.7 index e791e0ace..a9d35dcd2 100644 --- a/man/man7/depot_tools.7 +++ b/man/man7/depot_tools.7 @@ -2,12 +2,12 @@ .\" Title: depot_tools .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" 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 .\" ----------------------------------------------------------------- diff --git a/man/man7/depot_tools_tutorial.7 b/man/man7/depot_tools_tutorial.7 index 9c553f3f2..40e1338aa 100644 --- a/man/man7/depot_tools_tutorial.7 +++ b/man/man7/depot_tools_tutorial.7 @@ -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 -.\" 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 \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 .\} diff --git a/man/src/depot_tools_tutorial.txt b/man/src/depot_tools_tutorial.txt index ff7cb7bd9..a1169556c 100644 --- a/man/src/depot_tools_tutorial.txt +++ b/man/src/depot_tools_tutorial.txt @@ -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 diff --git a/man/src/git-cl.txt b/man/src/git-cl.txt index acb2df29b..0c94ec837 100644 --- a/man/src/git-cl.txt +++ b/man/src/git-cl.txt @@ -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