aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
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.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a155deff42'
${ noResults }
depot_tools/man/html
History
Mason Freed a155deff42 Revert "Remove "attempt to squash" behavior from `git rebase-update`" 
This reverts commit 58625e82c6.

Reason for revert: Several comments on crbug.com/40264739 that this broke their workflow. I plan to revert this and put patchset #2 back up for review, with an opt-in instead of a change to the default behavior.

Original change's description:
> Remove "attempt to squash" behavior from `git rebase-update`
>
> In common workflows, this step only succeeds ~5% of the time, and
> in the other 95% of cases, simply adds ~30 seconds of wasted time
> to the execution time of `rebase-update`. Therefore, this CL removes
> the automated functionality, and leaves squashing as a manual option
> to the user.
>
> Fixed: 40264739
> Bug: 40390274
> Change-Id: Ib2a3ffe4b0e5d0b74323a2a0d34ab0e1b7fafb08
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6104282
> Auto-Submit: Mason Freed <masonf@chromium.org>
> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
> Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>

Bug: 40390274
Change-Id: I91210a5a21b3751695553433389f346ba443bb1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6254237
Auto-Submit: Mason Freed <masonf@chromium.org>
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
 		5 months ago
..
depot_tools.html Use py3 in documentation generation 3 years ago
depot_tools_tutorial.html Switch to using issues.chromium.org bug links 1 year ago
git-cl.html [docs] Improve `git cl patch --help` 2 years ago
git-footers.html Use py3 in documentation generation 3 years ago
git-freeze.html Use py3 in documentation generation 3 years ago
git-hyper-blame.html Use py3 in documentation generation 3 years ago
git-map-branches.html Use py3 in documentation generation 3 years ago
git-map.html Use py3 in documentation generation 3 years ago
git-mark-merge-base.html Use py3 in documentation generation 3 years ago
git-nav-downstream.html Use py3 in documentation generation 3 years ago
git-nav-upstream.html Use py3 in documentation generation 3 years ago
git-new-branch.html [depot_tools] clarify that new-branch also switch. 2 years ago
git-rebase-update.html Revert "Remove "attempt to squash" behavior from `git rebase-update`" 5 months ago
git-rename-branch.html Use py3 in documentation generation 3 years ago
git-reparent-branch.html Use py3 in documentation generation 3 years ago
git-retry.html Use py3 in documentation generation 3 years ago
git-squash-branch.html Use py3 in documentation generation 3 years ago
git-thaw.html Use py3 in documentation generation 3 years ago
git-upstream-diff.html Use py3 in documentation generation 3 years ago