summaryrefslogtreecommitdiff
path: root/merge-protos
blob: 758fc46d59d8537736b9224013fa1b00c28cbc40 (plain)
1
2
3
4
5
6
#!/bin/sh

for i in `cat protos | grep -v x11proto`; do
    git merge --allow-unrelated-histories $i/master --commit --no-edit -m"Merge $i"
    ./move-protos $i
done