http://git.etersoft.ru/projects
/
wine
/
eterwine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
817c98a
)
return to eterhack when needed
author
Vitaly Lipatov
<lav@etersoft.ru>
Sun, 4 May 2008 18:40:21 +0000
(22:40 +0400)
committer
Vitaly Lipatov
<lav@etersoft.ru>
Sun, 4 May 2008 18:40:21 +0000
(22:40 +0400)
etersoft/release_current.sh
patch
|
blob
|
blame
|
history
diff --git
a/etersoft/release_current.sh
b/etersoft/release_current.sh
index 2371bea4434514cc733b8efc8bef8df1d01f920a..6c8c81d464f2db5dfaa9241db85e2efb0bf502ce 100755
(executable)
--- a/
etersoft/release_current.sh
+++ b/
etersoft/release_current.sh
@@
-21,13
+21,13
@@
git-checkout pure
#git-pull origin master || exit 1
pure_rev=`git-rev-parse refs/remotes/origin/master`
test -n "pure_rev" || exit 1
+git-checkout $BRANCH || exit 1
# Merge upstream changes with master branch
#git-checkout master
#git-merge pure || exit 1
# Merge master changes with $BRANCH branch
-#git-checkout $BRANCH
#git-merge master || exit 1
CURGIT=`pwd`