diff options
| author | Mauricio Wolff <mauricio.wolff+gh@gmail.com> | 2020-02-28 03:06:20 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 17:06:20 +0100 |
| commit | bccfe1389c97379388a148b3a48a63d7272ec017 (patch) | |
| tree | f99934b286acde18bf86d717d659f973d626293e /tools/upgrade.sh | |
| parent | 6cb8ff391d0258434485dbe246f9885ba85cf839 (diff) | |
| download | zsh-bccfe1389c97379388a148b3a48a63d7272ec017.tar.gz zsh-bccfe1389c97379388a148b3a48a63d7272ec017.tar.bz2 zsh-bccfe1389c97379388a148b3a48a63d7272ec017.zip | |
updater: add --autostash to git pull (#7172)
If I have custom configs (like theme customizations) I have to stash my changes and get them back after the update.
By adding the --autostash on upgrade.sh, if I have any changes not commited they'll be reapplied after the upgrade, allowing me to have temporary customizations without any harm to the upgrade process.
Diffstat (limited to 'tools/upgrade.sh')
| -rw-r--r-- | tools/upgrade.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 3005e6542..0dc84e214 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -38,7 +38,7 @@ if [ -n "$remote" ]; then fi printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh" -if git pull --rebase --stat origin master +if git pull --rebase --autostash --stat origin master then printf '%s' "$GREEN" printf '%s\n' ' __ __ ' |