Gaze/dotar
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved private info into env variables, cleanup

Browse Source
This commit is contained in:
yan 2011-11-22 13:30:09 -06:00 committed by $GIT_USER
parent 0ebab432d3
commit 9b316b6022
1 changed files with 60 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gitconfig
View File

@ -1,3 +1,10 @@
# set these tokens up in your env, such as ~/.secrets
[github]
user = $GITHUB_USER
token = $GITHUB_TOKEN
[user]
name = $GIT_USER
email = $GIT_EMAIL
[color] [color]
ui = true ui = true
[color "branch"] [color "branch"]
@ -82,18 +89,6 @@
editor = /usr/bin/vim editor = /usr/bin/vim
excludesfile = ~/.dotfiles/gitignore_global excludesfile = ~/.dotfiles/gitignore_global
[merge]
tool = threesome
[mergetool "threesome"]
cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
trustExitCode = true
[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
[advice] [advice]
statusHints = false statusHints = false
[diff] [diff]