I often monitor files that change. Now that can be done with mon. yay now uses its cache way better. Unused scripts for suckless merges were removed, I find it much better to run the commands manually without the scripts as they tend to break more oftenmaster
@ -1,7 +0,0 @@ |
|||||
#!/bin/zsh |
|
||||
|
|
||||
# for cleaning up the master branch of a git directory according to my suckless patch structure |
|
||||
# e.g. see dwm/st/etc |
|
||||
# by uoou, checkout gitlab.com/uoou/dotfiles |
|
||||
|
|
||||
make clean && rm -f config.h && git reset --hard origin/base |
|
||||
@ -1,22 +0,0 @@ |
|||||
#!/bin/bash |
|
||||
|
|
||||
# for showing the diffs to the master branch of a git directory according to my suckless patch structure |
|
||||
# e.g. see dwm/st/etc |
|
||||
# by uoou, checkout gitlab.com/uoou/dotfiles |
|
||||
|
|
||||
git checkout master && |
|
||||
dotfiles="/home/tiynger/.config/dotfiles/suckless" |
|
||||
project=$(basename $(pwd)) |
|
||||
diffdir="${dotfiles}/${project}_diffs/" |
|
||||
olddiffdir="${dotfiles}/${project}_diffs/old/" |
|
||||
rm -rf "$olddiffdir" && |
|
||||
mkdir -p "$olddiffdir" && |
|
||||
mkdir -p "$diffdir" && |
|
||||
mv "$diffdir"*.diff "$olddiffdir" || true && |
|
||||
make clean && rm -f config.h && git reset --hard origin/base && |
|
||||
for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do |
|
||||
if [ "$branch" != "master" ];then |
|
||||
git diff base..$branch > "${diffdir}${project}_${branch}.diff" |
|
||||
fi |
|
||||
done |
|
||||
|
|
||||
@ -1,16 +0,0 @@ |
|||||
#!/bin/bash |
|
||||
|
|
||||
# for merging all branches into the master branch of a git directory according to my suckless patch structure |
|
||||
# e.g. see dwm/st/etc |
|
||||
# by uoou, checkout gitlab.com/uoou/dotfiles |
|
||||
|
|
||||
suckdiff && |
|
||||
git reset --hard origin/base && |
|
||||
for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do |
|
||||
if [[ ("$branch" != "master") && ("$branch" != "base") ]];then |
|
||||
echo $branch |
|
||||
git merge $branch -m $branch |
|
||||
fi |
|
||||
done |
|
||||
make && sudo make clean install |
|
||||
|
|
||||