Skip to content

Instantly share code, notes, and snippets.

@karbassi
Last active August 29, 2015 14:00
Show Gist options
  • Star 3 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save karbassi/84a6a2d723c06e00f28c to your computer and use it in GitHub Desktop.
Save karbassi/84a6a2d723c06e00f28c to your computer and use it in GitHub Desktop.
.gitconfig
[github]
user = USERNAMEHERE
token = TOKENHERE
[user]
name = FIRST LAST
email = EMAIL@DDRESS.COM
[color]
status = auto
branch = auto
diff = auto
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[merge]
tool = opendiff
[mergetool "opendiff"]
# cmd = "/usr/bin/opendiff $LOCAL $OTHER -ancestor $BASE -merge $MERGED"
cmd = "/usr/bin/opendiff $LOCAL $BASE -merge $MERGED"
[core]
excludesfile = ~/.gitignore
compression = 9
autocrlf = input
[alias]
s = stash
sa = stash apply
sl = stash list
sp = stash pop
st = status -sb
ci = commit
br = branch
co = checkout
d = diff --word-diff
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr by %cn)%Creset' --abbrev-commit --date=relative
lgs = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr by %cn)%Creset' --abbrev-commit --date=relative --shortstat
svngrab = !git stash && git svn rebase && git stash apply
undo-commit = reset --soft HEAD^
[branch]
autosetupmerge = true
[instaweb]
httpd=webrick
port=1234
[push]
default = current
[rerere]
enabled = 1
[credential]
helper = osxkeychain
[url "https://github"]
insteadOf = git://github
[pull]
default = current
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment