2016-05-15 00:22:04 +02:00
|
|
|
#
|
|
|
|
# zim_update - update the zim repository
|
|
|
|
#
|
|
|
|
|
2017-06-11 01:54:22 +02:00
|
|
|
cd ${ZIM_HOME}
|
2016-05-15 00:22:04 +02:00
|
|
|
|
2017-01-21 17:25:30 +01:00
|
|
|
# this is the cleanest way I know how to update a repository
|
2016-05-15 00:22:04 +02:00
|
|
|
git remote update -p
|
|
|
|
git merge --ff-only @\{u\}
|
|
|
|
# and update the submodules
|
2017-01-21 17:25:30 +01:00
|
|
|
git submodule update --init --recursive
|