diff --git a/install.zsh b/install.zsh index 5e9c7d2..9092a1a 100755 --- a/install.zsh +++ b/install.zsh @@ -100,6 +100,9 @@ function at-repos-pull() { echo $repo if [ -d $d/repos/${repo##*/} ];then cd $d/repos/${repo##*/} + # Clean up before pull: reset changes and remove .orig files from previous patches + git checkout -- . + find . -name "*.orig" -type f -delete 2>/dev/null git stash -u if ! git pull;then rm -rf $d/repos/${repo##*/}