OSDN Git Service
(root)
/
wesnoth-ja
/
transifex_scripts.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b336828
)
masterブランチに変更
master
author
Hironori Fujimoto
<broadbarredfirefish@gmail.com>
Tue, 1 May 2018 00:51:50 +0000
(09:51 +0900)
committer
Hironori Fujimoto
<broadbarredfirefish@gmail.com>
Tue, 1 May 2018 00:51:50 +0000
(09:51 +0900)
build.sh
patch
|
blob
|
history
diff --git
a/build.sh
b/build.sh
index
4e52ade
..
709403d
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-17,8
+17,8
@@
git stash
git stash clear
echo 'リポジトリの更新・マージ'
git fetch origin
-git checkout
1.14
-git merge origin/
1.14
+git checkout
master
+git merge origin/
master
if [ ! -d ${BUILD_DIR} ]; then
mkdir ${BUILD_DIR}