diff options
| author | MatMoul <matmoul@gmail.com> | 2015-08-20 21:03:57 +0200 |
|---|---|---|
| committer | MatMoul <matmoul@gmail.com> | 2015-08-20 21:03:57 +0200 |
| commit | 163768423bc90dd6aa1ea91286befa203b55c840 (patch) | |
| tree | 741b937f772c2853edb3100238b4cb4ac627068a | |
| parent | bf606c032bb32df01f2fbcfa74fd53b70bb7fda1 (diff) | |
| download | hyperfi-163768423bc90dd6aa1ea91286befa203b55c840.tar.lz hyperfi-163768423bc90dd6aa1ea91286befa203b55c840.tar.xz hyperfi-163768423bc90dd6aa1ea91286befa203b55c840.zip | |
Update
| -rwxr-xr-x | makerelease | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/makerelease b/makerelease index 70684eb..253eb90 100755 --- a/makerelease +++ b/makerelease @@ -42,7 +42,7 @@ sed -i '1s/^/Current Version :\n/' CHANGELOG echo "Make last commit..." git commit -m "New Release : $version" * -if [ ! "$branch" = ""]; then +if [ ! "$branch" = "master"]; then echo "Merge branch $branch to master..." git checkout master git merge $branch |