psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-12-23 14:33:21 -05:00
Code Issues Releases Wiki Activity

[tools] zmanage update: track submodules

Browse source 
This change causes `zmanage update` to track the submodules as described
in origin/master, not from their upstream (dirty) states. Users wishing
to "revert" this change on occasion to test some upstream submodule
features, do: `cd ~/.zim && gSu`, assuming you have the git aliases.
This will pull the upstream modules to their latest state, leaving a
dirty HEAD state with these untracked modules. `cd ~/.zim && gSI` to
revert.

Closes #127
This commit is contained in:
Matt Hamilton 2017-01-21 08:25:30 -08:00
parent bf5e3a8c6b
commit 2c0cc6fbd7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/zim_update
View file

@ -4,8 +4,8 @@
cd ${ZDOTDIR:-${HOME}/.zim} cd ${ZDOTDIR:-${HOME}/.zim}
# this is the cleanest way I know of to update a repository # this is the cleanest way I know how to update a repository
git remote update -p git remote update -p
git merge --ff-only @\{u\} git merge --ff-only @\{u\}
# and update the submodules # and update the submodules
git submodule foreach --quiet --recursive git pull origin master git submodule update --init --recursive