• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1#!/bin/bash
2
3UPSTREAM_COMMIT=$(git merge-base HEAD aosp/upstream-main)
4
5git diff HEAD..$UPSTREAM_COMMIT --stat -- $(find . -name "*.rs" -o -name "*.toml")
6
7function crosvm_take_theirs() {
8    git checkout $UPSTREAM_COMMIT -- $(find . -name "*.rs" -o -name "*.toml" | grep -v "/out/")
9}
10