From 5bf8101f2a6f7ca60e09558b08430afc085d2044 Mon Sep 17 00:00:00 2001
From: fpi
Date: Sun, 23 Feb 2020 18:40:09 +0100
Subject: Exclude branches which match +$ in merge script

---
 README.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index 03ac014..929e139 100644
--- a/README.org
+++ b/README.org
@@ -12,13 +12,13 @@ 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:
+except the ones which end with a plus sign 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 branch | grep -v -e +$ -e master | sed "s/[ *] //" | xargs git merge
 git push --force origin master
 #+end_src
 
-- 
cgit v1.2.3