chromium_depot_tools/git-squash-branch-tree at cece8f8061f7f81011707776e82d8e4ced3f3297 - chromium_depot_tools - InTheForest

InTheForest/chromium_depot_tools

mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00

Files

Patrick Monette 367c6f720d Add git squash-branch-tree

This script allows squashing a branch and all of its downstream
branches in one command.

This is useful for squashing stacked branches that have a lot of
commits each just before using `git rebase-update`, as this is
highly likely to run into a lot of rebase conflicts, repeatedly.

This should only be used if the user is okay with losing their
git commit history.

Change-Id: Id28a941d898def73f785d791499c7ee0784e0136
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5659262
Reviewed-by: Gavin Mak <gavinmak@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>

2024-07-02 15:03:58 +00:00

7 lines

215 B

Bash

Executable File

Raw Blame History

 #!/usr/bin/env bash
 # Copyright 2024 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 . "$(type -P python_runner.sh)"