You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
#!/bin/bash
|
|
|
|
UPSTREAM_COMMIT=$(git merge-base HEAD aosp/upstream-main)
|
|
|
|
git diff HEAD..$UPSTREAM_COMMIT --stat -- $(find . -name "*.rs" -o -name "*.toml")
|
|
|
|
function crosvm_take_theirs() {
|
|
git checkout $UPSTREAM_COMMIT -- $(find . -name "*.rs" -o -name "*.toml" | grep -v "/out/")
|
|
}
|
