Mercurial > hg > config

annotate bin/git-rebase.sh @ 841:d471e0269170

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add .cache directory for pytest
author Jeff Hammel <k0scist@gmail.com>
date Sat, 13 May 2017 18:35:31 -0700
parents 205dd903e4c8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
785
205dd903e4c8 add some mediocre workflow
Jeff Hammel <k0scist@gmail.com>
parents:
diff changeset
1 #!/bin/bash
205dd903e4c8 add some mediocre workflow
Jeff Hammel <k0scist@gmail.com>
parents:
diff changeset
2 export BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
205dd903e4c8 add some mediocre workflow
Jeff Hammel <k0scist@gmail.com>
parents:
diff changeset
3 export PATCH=$(mktemp --suffix .diff)
205dd903e4c8 add some mediocre workflow
Jeff Hammel <k0scist@gmail.com>
parents:
diff changeset
4 echo Patch at $PATCH
205dd903e4c8 add some mediocre workflow
Jeff Hammel <k0scist@gmail.com>
parents:
diff changeset
5 git diff $(git merge-base HEAD master) > ${PATCH}
205dd903e4c8 add some mediocre workflow
Jeff Hammel <k0scist@gmail.com>
parents:
diff changeset
6 cd `git rev-parse --show-toplevel`
205dd903e4c8 add some mediocre workflow
Jeff Hammel <k0scist@gmail.com>
parents:
diff changeset
7 patch -p1 < ${PATCH}