summaryrefslogtreecommitdiff
path: root/scripts/merge-request.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/merge-request.sh')
-rwxr-xr-xscripts/merge-request.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/scripts/merge-request.sh b/scripts/merge-request.sh
new file mode 100755
index 0000000..43275d0
--- /dev/null
+++ b/scripts/merge-request.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+ echo "Merge request number needed"
+ exit 1
+fi
+
+# Check out a new branch for integration
+git checkout -b merge-requests/$1
+
+# Fetch the merge request into this branch
+git pull git://gitorious.org/meego-os-base/package-groups.git refs/merge-requests/$1
+
+# Show the commits, assess they are okay
+git log --pretty=oneline --abbrev-commit master..merge-requests/$1
+
+# To apply the changes to your branch:
+git checkout master
+git merge merge-requests/$1
+git push origin master