diff options
Diffstat (limited to 'attic/merge-protos')
| -rw-r--r-- | attic/merge-protos | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/attic/merge-protos b/attic/merge-protos new file mode 100644 index 0000000..758fc46 --- /dev/null +++ b/attic/merge-protos @@ -0,0 +1,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 |