diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2012-11-09 11:44:55 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2012-11-09 11:44:55 -0800 |
| commit | 44b560e25016645fa5a9984cd0ca2e380046a185 (patch) | |
| tree | 75883f4c10375062d09100e852bbda2a2226ebdd /scripts/merge-request.sh | |
| download | pattern-tools-44b560e25016645fa5a9984cd0ca2e380046a185.tar.gz pattern-tools-44b560e25016645fa5a9984cd0ca2e380046a185.tar.bz2 pattern-tools-44b560e25016645fa5a9984cd0ca2e380046a185.zip | |
initial checkin 001
Diffstat (limited to 'scripts/merge-request.sh')
| -rwxr-xr-x | scripts/merge-request.sh | 20 |
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 |