tiyn/dotfiles
1
0
Fork 0
mirror of https://github.com/tiyn/dotfiles.git synced 2025-10-09 19:11:15 +02:00
Code Issues Projects Releases Wiki Activity

changing suckless merge utils for having a base branch to ensure the master can be pushed with all features to ensure buildability without this utils

Browse Source
This commit is contained in:
TiynGER
2020-03-29 11:46:32 +02:00
parent eeb966e1b6
commit 46fce77dd2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.local/bin/suckless/suckmerge
View File

@@ -1,8 +1,8 @@
#!/bin/zsh
suckdiff &&
git reset --hard origin/master &&
git reset --hard origin/base &&
for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
if [ "$branch" != "master" ];then
if [[ ("$branch" != "master") && ("$branch" != "base") ]];then
echo $branch
git merge $branch -m $branch
fi