diff options
| author | fpi | 2020-02-23 18:43:50 +0100 |
|---|---|---|
| committer | fpi | 2020-02-23 18:43:50 +0100 |
| commit | 699c269abaf109e4f997e50e68a76e0454f5cdf1 (patch) | |
| tree | 55e682eb13154168cea137e004b5c6a03d39f764 | |
| parent | Exclude branches which match +$ in merge script (diff) | |
Include remote branches in the merge script
| -rw-r--r-- | README.org | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |