From fc2267fb8857a0af0dd63d683756a7f839834665 Mon Sep 17 00:00:00 2001
From: fpi
Date: Sun, 2 Feb 2020 15:40:19 +0100
Subject: Add git merge script

---
 README.org | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'README.org')

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
-- 
cgit v1.2.3