Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

mailアドレスの変更及びSourceTree.appの設定追加

  • Loading branch information...
commit 4bd466e3ac4b87f29efe291268c7b0f879d15433 1 parent 43e2c98
@dictav authored
Showing with 7 additions and 1 deletion.
  1. +7 −1 .gitconfig
View
8 .gitconfig
@@ -1,6 +1,6 @@
[user]
name = Shintaro Abe
- email = dictav@mac.com
+ email = dictav@gmail.com
[core]
editor = vim
pager = vimpager
@@ -19,3 +19,9 @@
co = checkout
s = status
b = branch
+[difftool "sourcetree"]
+ cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+ path =
+[mergetool "sourcetree"]
+ cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+ trustExitCode = true
Please sign in to comment.
Something went wrong with that request. Please try again.