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