summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfpi2020-02-23 18:40:09 +0100
committerfpi2020-02-23 18:40:09 +0100
commit5bf8101f2a6f7ca60e09558b08430afc085d2044 (patch)
tree9a416f498afa11e2a32dcb821cefc980741a28df
parentAdd git merge script (diff)
Exclude branches which match +$ in merge script
-rw-r--r--README.org6
1 files 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