2020-05-04 10:53:44 +02:00
|
|
|
#!/bin/bash
|
2020-03-31 20:32:16 +02:00
|
|
|
|
|
|
|
|
# for merging all branches into the master branch of a git directory according to my suckless patch structure
|
|
|
|
|
# e.g. see dwm/st/etc
|
2020-04-02 00:06:34 +02:00
|
|
|
# by uoou, checkout gitlab.com/uoou/dotfiles
|
2020-03-31 20:32:16 +02:00
|
|
|
|
2020-03-28 17:42:27 +01:00
|
|
|
suckdiff &&
|
2020-03-29 11:46:32 +02:00
|
|
|
git reset --hard origin/base &&
|
2020-03-28 17:42:27 +01:00
|
|
|
for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
|
2020-03-29 11:46:32 +02:00
|
|
|
if [[ ("$branch" != "master") && ("$branch" != "base") ]];then
|
2020-03-28 17:42:27 +01:00
|
|
|
echo $branch
|
|
|
|
|
git merge $branch -m $branch
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
make && sudo make clean install
|
|
|
|
|
|
