19 lines
219 B
Bash
19 lines
219 B
Bash
|
#!/bin/bash
|
||
|
|
|
||
|
|
|
||
|
|
# change into the submodule build directory
|
||
|
|
pushd `dirname $0`
|
||
|
|
cd ../build
|
||
|
|
|
||
|
|
if [ -z "$1" ]; then
|
||
|
|
popd
|
||
|
|
echo "Usage: $0 <sha-commit>"
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
|
||
|
|
git fetch origin $1
|
||
|
|
git merge $1 -X theirs
|
||
|
|
|
||
|
|
popd
|
||
|
|
exit 0
|