You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2451ee476d
See crbug.com/40264739 for many more details. But a prior attempt to land this patch resulted in [1] which simply removed all squashing behavior from `git rebase-update`. That broke several people's workflows. So this patch attempts, again, to simply add an opt-in to *not* squashing, for the folks (like me) who do not want that behavior. [1] https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6104282 Fixed: 40264739 Change-Id: I4a6aa8e53e854a7e601a0fb83f4f9fcb638d36ed Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6254099 Reviewed-by: Mason Freed <masonf@chromium.org> Commit-Queue: Mason Freed <masonf@chromium.org> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Auto-Submit: Mason Freed <masonf@chromium.org> |
4 months ago | |
|---|---|---|
| .. | ||
| git-cl.1 | ||
| git-footers.1 | ||
| git-freeze.1 | ||
| git-hyper-blame.1 | ||
| git-map-branches.1 | ||
| git-map.1 | ||
| git-mark-merge-base.1 | ||
| git-nav-downstream.1 | ||
| git-nav-upstream.1 | ||
| git-new-branch.1 | ||
| git-rebase-update.1 | ||
| git-rename-branch.1 | ||
| git-reparent-branch.1 | ||
| git-retry.1 | ||
| git-squash-branch.1 | ||
| git-thaw.1 | ||
| git-upstream-diff.1 | ||