tree e1bb77374b61b98f28cafb243de3d4af67b0e45c
parent 4c55b355580f0c0f0daebfb086b2ccf11d90f605
author Edward Lemur <ehmaldonado@chromium.org> 1566496645 +0000
committer Commit Bot <commit-bot@chromium.org> 1566496645 +0000

depot_tools: Use git-checkout instead of git-rebase.

Changes like crrev.com/c/1752507, where a file that was previously in
.gitignore becomes part of the repo, makes update_depot_tools fail
to rebase.

Use git checkout origin/master instead.

Bug: 996359
Change-Id: Ib1a43b8842cebce96ab1fabaedc8e5653b9a708e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1764708
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>