Merge branch 'refs/heads/master' of local repository into HEAD
This commit is contained in:
commit
98a62fafe9
2 changed files with 2 additions and 1 deletions
2
build-scripts/sync_git_hg.sh
Executable file → Normal file
2
build-scripts/sync_git_hg.sh
Executable file → Normal file
|
@ -18,7 +18,7 @@ hg update -c
|
|||
# [paths]
|
||||
# default = git://github.com/osmandapp/Osmand.git
|
||||
# googlecode = https://username:password@osmand.googlecode.com/hg
|
||||
hg push googlecode
|
||||
hg push -f googlecode
|
||||
|
||||
echo "Synchronization is ok"
|
||||
|
||||
|
|
1
build-scripts/update_git.sh
Executable file → Normal file
1
build-scripts/update_git.sh
Executable file → Normal file
|
@ -11,6 +11,7 @@ if [ ! -d "$GIT_DIR" ]; then
|
|||
fi
|
||||
# update git
|
||||
cd "${GIT_DIR}"
|
||||
git reset --hard
|
||||
git checkout master
|
||||
git pull ${GIT_ORIGIN_NAME}
|
||||
|
||||
|
|
Loading…
Reference in a new issue