mirror of https://github.com/tiyn/dotfiles
parent
c0b7fd321d
commit
779381516d
@ -0,0 +1,2 @@
|
||||
#!/bin/zsh
|
||||
make clean && rm -f config.h && reset --hard origin/master
|
@ -0,0 +1,17 @@
|
||||
#!/usr/bin/zsh
|
||||
git checkout master &&
|
||||
dotfiles="/home/drew/.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/master &&
|
||||
for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
|
||||
if [ "$branch" != "master" ];then
|
||||
git diff master..$branch > "${diffdir}${project}_${branch}.diff"
|
||||
fi
|
||||
done
|
||||
|
@ -0,0 +1,11 @@
|
||||
#!/bin/zsh
|
||||
suckdiff &&
|
||||
git reset --hard origin/master &&
|
||||
for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
|
||||
if [ "$branch" != "master" ];then
|
||||
echo $branch
|
||||
git merge $branch -m $branch
|
||||
fi
|
||||
done
|
||||
make && sudo make clean install
|
||||
|
Loading…
Reference in new issue