merge-linux-tegra.sh

#!/bin/bash

set -e
set -x

. "${0%/*}/tegra-branches.sh.dot"

if [ "$1" != "--no-reset" ]; then
  git checkout for-next
  git reset --hard ${merge_base}
fi

for b in ${branches}; do
    git merge -m "Merge branch ${b} into for-next" --no-ff ${b}
done