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

115
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"]
@ -10,98 +17,86 @@
old = red bold old = red bold
new = green bold new = green bold
[alias] [alias]
d = diff # show unstaged changes d = diff # show unstaged changes
dc = diff --cached # show staged changes dc = diff --cached # show staged changes
last = diff HEAD^ # show last committed change last = diff HEAD^ # show last committed change
unstage = reset HEAD # remove files from index (tracking) unstage = reset HEAD # remove files from index (tracking)
uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state uncommit = reset --soft HEAD^ # go back before last commit, with files in uncommitted state
chunkyadd = add --patch # stage commits chunk by chunk chunkyadd = add --patch # stage commits chunk by chunk
filelog = log -u # show changes to a file filelog = log -u # show changes to a file
amend = commit --amend amend = commit --amend
ammend = commit --amend ammend = commit --amend
mt = mergetool #fire up the merge tool mt = mergetool #fire up the merge tool
addall = !sh -c 'git add . && git add -u' addall = !sh -c 'git add . && git add -u'
# rebasing # rebasing
rc = rebase --continue rc = rebase --continue
rs = rebase --skip rs = rebase --skip
# save some typing for common commands # save some typing for common commands
ci = commit ci = commit
co = checkout co = checkout
b = branch -v b = branch -v
r = remote -v r = remote -v
t = tag -n t = tag -n
# create and switch to a new branch (mnemonic: "git new branch branchname...") # create and switch to a new branch (mnemonic: "git new branch branchname...")
nb = checkout -b nb = checkout -b
stat = status stat = status
s = status s = status
# stashing # stashing
ss = stash ss = stash
sl = stash list sl = stash list
sa = stash apply sa = stash apply
sd = stash drop sd = stash drop
# grab a change from a branch # grab a change from a branch
cp = cherry-pick -x cp = cherry-pick -x
# move patch # move patch
# nice logs # nice logs
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
changelog = log --pretty=format:\" * %s\" changelog = log --pretty=format:\" * %s\"
shortnocolor = log --pretty=format:\"%h %cr %cn %s\" shortnocolor = log --pretty=format:\"%h %cr %cn %s\"
# svn helpers # svn helpers
svnr = svn rebase svnr = svn rebase
svnd = svn dcommit svnd = svn dcommit
svnl = svn log --oneline --show-commit svnl = svn log --oneline --show-commit
drop = !sh -c 'git add . && git stash && git stash drop' drop = !sh -c 'git add . && git stash && git stash drop'
grab = !sh -c 'git-grab.sh' grab = !sh -c 'git-grab.sh'
[gc] [gc]
# auto = 1 # auto = 1
[merge] [merge]
summary = true summary = true
verbosity = 1 verbosity = 1
[apply] [apply]
whitespace = nowarn whitespace = nowarn
[branch] [branch]
autosetupmerge = true autosetupmerge = true
[push] [push]
# 'git push' will push the current branch to its tracking branch # 'git push' will push the current branch to its tracking branch
# the usual default is to push all branches # the usual default is to push all branches
default = tracking default = tracking
[core] [core]
autocrlf = false autocrlf = false
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]
# Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
# instead of a/b/c/d as prefixes for patches # instead of a/b/c/d as prefixes for patches
mnemonicprefix = true mnemonicprefix = true
[rerere] [rerere]
# Remember my merges # Remember my merges
# http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/
enabled = true enabled = true