summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfpi2020-02-02 15:40:19 +0100
committerfpi2020-02-02 15:40:19 +0100
commitfc2267fb8857a0af0dd63d683756a7f839834665 (patch)
tree6a776c5457b7b6956e1af7dce7e2b574e064a8c3
parentAdd README (diff)
Add git merge script
-rw-r--r--README.org12
1 files changed, 12 insertions, 0 deletions
diff --git a/README.org b/README.org
index bfd2a0d..03ac014 100644
--- a/README.org
+++ b/README.org
@@ -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