view bin/git-rebase.sh @ 845:70ae14b6be51

[sync] ~/k0s is no longer in PATH as it corrupts PYTHONPATH
author Jeff Hammel <k0scist@gmail.com>
date Thu, 17 Aug 2017 09:48:49 -0700
parents 205dd903e4c8
children
line wrap: on
line source

#!/bin/bash
export BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
export PATCH=$(mktemp --suffix .diff)
echo Patch at $PATCH
git diff $(git merge-base HEAD master) > ${PATCH}
cd `git rev-parse --show-toplevel`
patch -p1 < ${PATCH}