Skip to content

Instantly share code, notes, and snippets.

@Fykec
Created November 25, 2013 04:11
Show Gist options
  • Save Fykec/7636248 to your computer and use it in GitHub Desktop.
Save Fykec/7636248 to your computer and use it in GitHub Desktop.
my gitconfig file
[user]
name = JiaJi Yin
email = yinjiaji110@gmail.com
[core]
quotepath = false
editor = "emacs -nw -q --load \"~/simple.emacs.d/init.el\""
texteditor = "emacs -nw -q --load \"~/simple.emacs.d/init.el\""
autocrlf = input
pager = tig
[diff]
tool = "twdiff"
[difftool]
prompt = false
[difftool "twdiff"]
cmd = /usr/local/bin/twdiff --wait --resume "$LOCAL" "$REMOTE"
[merge]
tool = "twdiff"
[mergetool]
prompt = false
[mergetool "twdiff"]
cmd = /usr/local/bin/twdiff --wait --resume "$LOCAL" "$REMOTE"
[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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment