Merge branch 'master' of https://github.com/dcarrillo/prezto

init.zsh

@@ -44,7 +44,7 @@ function zprezto-update {
         printf "There is an update available. Trying to pull.\n\n"
         if git pull --ff-only; then
           printf "Syncing submodules\n"
-          git submodule update --recursive
+          git submodule update --init --recursive
           return $?
         else
           cannot-fast-forward

modules/homebrew/README.md

@@ -18,8 +18,8 @@ Aliases
 ### Homebrew
 
   - `brewc` cleans outdated brews and their cached archives.
-  - `brewC` cleans outdated brews, including keg-only, and their cached archives.
   - `brewi` installs a formula.
+  - `brewL` lists installed formulae that are not dependencies of another installed formula.
   - `brewl` lists installed formulae.
   - `brewo` lists brews which have an update available.
   - `brews` searches for a formula.

modules/homebrew/init.zsh

@@ -14,7 +14,7 @@ fi
 # Variables
 #
 
-# Load standard Homebrew shellenv into the shell session. 
+# Load standard Homebrew shellenv into the shell session.
 # Load 'HOMEBREW_' prefixed variables only. Avoid loading 'PATH' related
 # variables as they are already handled in standard zsh configuration.
 if (( $+commands[brew] )); then
@@ -27,8 +27,8 @@ fi
 
 # Homebrew
 alias brewc='brew cleanup'
-alias brewC='brew cleanup --force'
 alias brewi='brew install'
+alias brewL='brew leaves'
 alias brewl='brew list'
 alias brewo='brew outdated'
 alias brews='brew search'

modules/utility/init.zsh

@@ -66,10 +66,10 @@ alias mvi="${aliases[mv]:-mv} -i"
 alias cpi="${aliases[cp]:-cp} -i"
 alias lni="${aliases[ln]:-ln} -i"
 if zstyle -T ':prezto:module:utility' safe-ops; then
-  alias rm='rmi'
+  alias rm="${aliases[rm]:-rm} -i"
-  alias mv='mvi'
+  alias mv="${aliases[mv]:-mv} -i"
-  alias cp='cpi'
+  alias cp="${aliases[cp]:-cp} -i"
-  alias ln='lni'
+  alias ln="${aliases[ln]:-ln} -i"
 fi
 
 # ls