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:
d306a3d
)
1.14ブランチを利用するように変更
author
Hironori Fujimoto
<broadbarredfirefish@gmail.com>
Thu, 22 Mar 2018 02:02:47 +0000
(11:02 +0900)
committer
Hironori Fujimoto
<broadbarredfirefish@gmail.com>
Thu, 22 Mar 2018 02:02:47 +0000
(11:02 +0900)
build.sh
patch
|
blob
|
history
diff --git
a/build.sh
b/build.sh
index
8630ebd
..
4e52ade
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-16,7
+16,9
@@
echo '作業ツリーの変更をリセット'
git stash
git stash clear
echo 'リポジトリの更新・マージ'
-git pull origin master
+git fetch origin
+git checkout 1.14
+git merge origin/1.14
if [ ! -d ${BUILD_DIR} ]; then
mkdir ${BUILD_DIR}