hmz007
36ed224bac
Signed-off-by: hmz007 <hmz007@gmail.com> Change-Id: Ib87fdbe7a0be7dc961af3500fe9ea4589a127f9f
10 lines
286 B
Bash
Executable File
10 lines
286 B
Bash
Executable File
#!/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/")
|
|
}
|