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.

16 lines
475 B

  1. #!/bin/bash
  2. # for merging all branches into the master branch of a git directory according to my suckless patch structure
  3. # e.g. see dwm/st/etc
  4. # by uoou, checkout gitlab.com/uoou/dotfiles
  5. suckdiff &&
  6. git reset --hard origin/base &&
  7. for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
  8. if [[ ("$branch" != "master") && ("$branch" != "base") ]];then
  9. echo $branch
  10. git merge $branch -m $branch
  11. fi
  12. done
  13. make && sudo make clean install