Git Scripts

README.md

Install the following programs and configure them with permissions to access your GitHub profile:

• ghi
• hub

These scripts assume the following two remotes exist:

• origin: your fork
• upstream: the upstream repository

Using git-land.sh:

• Create a branch for your change: git checkout -b foo
• Push branch: git push -u origin foo
• Create pull request: hub pull-request
• Land pull request: git-land.sh foo

Merging a pull request:

• Create rebased branch for pull request: git-pr-checkout.sh 1234
• Push pull request: git-pr-push.sh 1234

git-land.sh

#!/bin/sh -eux

BRANCH=$1

git checkout $BRANCH
git pull --rebase upstream master
git push --force origin HEAD:$BRANCH
git push upstream HEAD:master
git checkout master
git pull --ff-only upstream master
git push origin HEAD:master
git branch -d $BRANCH
git push --delete origin $BRANCH

git-pr-checkout.sh

#!/bin/sh -eux

PR=$1
BRANCH=pr$PR

git fetch upstream pull/$PR/head
git checkout -b $BRANCH FETCH_HEAD
git pull --rebase upstream master

git-pr-push.sh

#!/bin/sh -eux

PR=$1
BRANCH=pr$PR

git checkout $BRANCH
git pull --rebase upstream master
git push upstream HEAD:master
git checkout master
git pull --ff-only upstream master
git push origin HEAD:master
git branch -d $BRANCH
ghi comment --close -m 'Merged, thanks!' $PR

git-push-release.sh

#!/bin/sh -eux
git push origin master --tags
git push upstream master --tags