diff options
| author | MatMoul <matmoul@gmail.com> | 2019-02-02 22:57:47 +0100 |
|---|---|---|
| committer | MatMoul <matmoul@gmail.com> | 2019-02-02 22:57:47 +0100 |
| commit | aab86bb0a3c4af920b787597ddb30ff63b09de99 (patch) | |
| tree | eb5726516d872f1fdfa04d9afbceda9151b92022 | |
| parent | 82ba04733bae123b78cc98ad4732cd44f1f5ecf9 (diff) | |
| download | hyperfi-aab86bb0a3c4af920b787597ddb30ff63b09de99.tar.lz hyperfi-aab86bb0a3c4af920b787597ddb30ff63b09de99.tar.xz hyperfi-aab86bb0a3c4af920b787597ddb30ff63b09de99.zip | |
Update makerelease
| -rwxr-xr-x | makerelease | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/makerelease b/makerelease index 7ae0976..86851e1 100755 --- a/makerelease +++ b/makerelease @@ -106,6 +106,6 @@ rm -R .build if [ ! "$branch" = "master" ]; then git checkout $branch - git pull + git merge master git push fi |