diff options
| -rw-r--r-- | README.org | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -10,6 +10,18 @@ blocks make tangling take several seconds and ~org-babel-load-file~ in For now the symlinks need to be created by manually running the appropriate src block in each configuration file. +** Git Setup +Every program's configuration lives in its own branch. All branches +are then merged into =master=. To keep the git history clean, I use +this script: + +#+begin_src shell :shebang "#!/bin/bash" :tangle tangle/merge.sh +git checkout master +git reset --hard init +git branch | grep -v private | sed "s/[ *] //" | xargs git merge +git push --force origin master +#+end_src + * Window manager I use [[https://github.com/ch11ng/exwm][exwm]] and [[https://awesomewm.org/][awesome]] as my window managers. When doing a lot of coding and similar stuff I tend to use exwm as I will spend most of my |