e3d7b54ca3
Former-commit-id: bb0edac46772972b4c99a84b8e1791f43b9195f5
9 lines
362 B
Bash
Executable File
9 lines
362 B
Bash
Executable File
#!/bin/sh
|
|
|
|
CURRENT_BRANCH=$(git branch -l | egrep '^\* ' | cut -d ' ' -f 2)
|
|
DEBIAN_BRANCH=$(grep -h ^debian-branch $(git rev-parse --show-cdup)./debian/gbp.conf ~/.gbp.conf 2> /dev/null | head -n 1 | cut -d '=' -f 2)
|
|
DEBIAN_PATCHES=$(git branch -l | egrep "$DEBIAN_BRANCH-patches/")
|
|
for DEBIAN_PATCH in $DEBIAN_PATCHES; do
|
|
git merge --no-ff $DEBIAN_PATCH
|
|
done
|