view bin/git-rebase.sh @ 910:98bcf207cda3

remove -dev from k0s-requirements.txt; not compatible with new pip
author Jeff Hammel <k0scist@gmail.com>
date Fri, 12 Apr 2024 07:32:37 -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}