tiyn
/
dotfiles
mirror of https://github.com/Tiyn/dotfiles
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Dotfiles for different machines on different branches.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
305 Commits
2 Branches
0 Tags
23 MiB
Tree: 46fce77dd2
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '46fce77dd2'
${ noResults }
dotfiles/.local/bin/suckless/suckmerge

11 lines
295 B
Raw Normal View History

adding suckless git utilities
9 months ago
​
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
9 months ago
adding suckless git utilities
9 months ago
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
9 months ago
adding suckless git utilities
9 months ago
​
​
​
​
​
  1. #!/bin/zsh
  2. suckdiff &&
  3. git reset --hard origin/base &&
  4. for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
  5. if [[ ("$branch" != "master") && ("$branch" != "base") ]];then
  6. echo $branch
  7. git merge $branch -m $branch
  8. fi
  9. done
  10. make && sudo make clean install