diff --git a/etc/gitconfig b/etc/gitconfig index e1f2d20..27793c8 100644 --- a/etc/gitconfig +++ b/etc/gitconfig @@ -53,7 +53,7 @@ [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" - path = + path = [mergetool "sourcetree"] cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" trustExitCode = true diff --git a/zsh/zshrc b/zsh/zshrc index bd19b1c..9fc131c 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -16,7 +16,7 @@ autoload -Uz zmv # Partially disable the zsh's autocorrect feature # 下記コマンドについて、Zshのcorrect機能を表示させないようにする -cmmnds=(gulp rspec rubocop cf) +cmmnds=(gulp rspec rubocop cf ncu) for cmmnd in "${cmmnds[@]}"; do alias $cmmnd="nocorrect $cmmnd" done @@ -88,6 +88,9 @@ alias excel_cleanup='rm -rf ~/Library/Preferences/com.microsoft.Excel.plist ~/Li # export PATH="/Users/terada/.rbenv/shims:/Users/terada/.rbenv/shims:/Users/terada/Qt/5.1.0/clang_64/bin:/Applications/SenchaSDKTools-2.0.0-beta3:/Applications/SenchaSDKTools-2.0.0-Beta/jsbuilder:/Applications/SenchaSDKTools-2.0.0-Beta/bin:/Applications/SenchaSDKTools-2.0.0-Beta:/usr/local/git/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin:/usr/local/bin:/opt/local/bin:/opt/local/sbin:/opt/local/lib/postgresql91/bin:/Applications/SenchaSDKTools-2.0.0-Beta:/bin:/Applications/SenchaSDKTools-2.0.0-Beta/bin:/Applications/SenchaSDKTools-2.0.0-Beta/jsbuilder:/Applications/SenchaSDKTools-2.0.0-beta3:/Users/terada/bin:/Users/terada/ratproxy:/usr/local/Cellar/android-sdk/20130219/tools:/usr/local/Cellar/android-sdk/20130219/platform-tools:/Users/terada/bin/repo:/usr/local/share/npm/bin" +# お遊び系 +alias matrix='cmatrix' + export PATH=$PATH:/Applications/SenchaSDKTools-2.0.0-Beta export PATH=$PATH:/Applications/SenchaSDKTools-2.0.0-Beta/bin export PATH=$PATH:/Applications/SenchaSDKTools-2.0.0-Beta/jsbuilder