| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2020-06-24 | android_merge_from_upstream: fix up naming | George Burgess IV | |
| This replaces `master` with `main` where possible, per the linked bug. It also switches to a more concise way of making sure we're never on the local branch. BUG=chromium:1099035 TEST=Ran the script in android-llvm Change-Id: I0e656057acec857a2c91480cbd822a5bc6778563 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2265045 Reviewed-by: Manoj Gupta <manojgupta@chromium.org> Tested-by: George Burgess <gbiv@chromium.org> | |||
| 2019-10-04 | Add a merge-with-upstream script to toolchain-utils | George Burgess IV | |
| Android wants to pull toolchain-utils more often. In order to make this easier, let's have a script to do it. BUG=None TEST=The CL linked in the patch. Tried a few fun tricks to cover the conditional logic, too. Change-Id: If8de867b3711bf33309db7c64dc5b67e51e36423 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1841586 Reviewed-by: Stephen Hines <srhines@google.com> Reviewed-by: Manoj Gupta <manojgupta@chromium.org> Tested-by: George Burgess <gbiv@chromium.org> | |||
 |
index : external/toolchain-utils.git | |
| [no description] |
| aboutsummaryrefslogtreecommitdiff |