summaryrefslogtreecommitdiff
path: root/attic/merge-protos
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-02-01 15:07:35 -0500
committerAdam Jackson <ajax@redhat.com>2018-02-01 15:07:35 -0500
commit866582439ac2410e5ae98c3387718b7a28e04917 (patch)
tree1b23e82ad57ad46edf7a227aff0fe544efcec0cc /attic/merge-protos
parent193b75db8c1aa9d91d079901d7da98ec72810378 (diff)
Move the migration scripts and data to the attic
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'attic/merge-protos')
-rw-r--r--attic/merge-protos6
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