From 699c269abaf109e4f997e50e68a76e0454f5cdf1 Mon Sep 17 00:00:00 2001
From: fpi
Date: Sun, 23 Feb 2020 18:43:50 +0100
Subject: Include remote branches in the merge script

---
 README.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 929e139..0877cc1 100644
--- a/README.org
+++ b/README.org
@@ -18,7 +18,7 @@ except the ones which end with a plus sign are then merged into
 #+begin_src shell :shebang "#!/bin/bash" :tangle tangle/merge.sh
 git checkout master
 git reset --hard init
-git branch | grep -v -e +$ -e master | sed "s/[ *] //" | xargs git merge
+git branch -a | grep -v -e +$ -e master | sed "s/[ *] //" | xargs git merge
 git push --force origin master
 #+end_src
 
-- 
cgit v1.2.3