Skip to content

Instantly share code, notes, and snippets.

@marc1706

marc1706/merge_32x_pr.sh

Last active June 17, 2019 08:04
Show Gist options
  • Save marc1706/2c26a1bfcae0dc2da6f98403013319f0 to your computer and use it in GitHub Desktop.
Save marc1706/2c26a1bfcae0dc2da6f98403013319f0 to your computer and use it in GitHub Desktop.
Download ZIP
Bash scripts for merging and pushing GitHub pull requests for phpBB
Raw
merge_32x_pr.sh
#!/bin/bash
set -e
PR=$1
git checkout 3.2.x && git fetch upstream && git fetch origin && git reset --hard upstream/3.2.x && hub merge $1 && git push origin 3.2.x
git checkout 3.3.x && git reset --hard upstream/3.3.x && git merge --no-ff --no-edit 3.2.x && git push origin 3.3.x
git checkout master && git reset --hard upstream/master && git merge --no-ff --no-edit 3.3.x && git push origin master
Raw
merge_33x_pr.sh
#!/bin/bash
set -e
PR=$1
git checkout 3.3.x && git fetch upstream && git fetch origin && git reset --hard upstream/3.3.x && hub merge $1 && git push origin 3.3.x
git checkout master && git reset --hard upstream/master && git merge --no-ff --no-edit 3.3.x && git push origin master
Raw
merge_master_pr.sh
#!/bin/bash
set -e
PR=$1
git checkout master && git fetch upstream && git fetch origin && git reset --hard upstream/master && hub merge $1 && git push origin master
Raw
push_32x_pr.sh
#!/bin/bash
set -e
git push upstream 3.2.x && sleep 5 && git push upstream 3.3.x && sleep 5 && git push upstream master
Raw
push_33x_pr.sh
#!/bin/bash
set -e
git push upstream 3.3.x && sleep 5 && git push upstream master
Raw
push_master_pr.sh
#!/bin/bash
set -e
git push upstream master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment