Skip to content

Instantly share code, notes, and snippets.

Created April 15, 2013 11:38
Show Gist options
  • Save anonymous/5387489 to your computer and use it in GitHub Desktop.
Save anonymous/5387489 to your computer and use it in GitHub Desktop.
My personal gitconfig, remember to insert your own username where needed
[user]
email = [email protected]
name = Torstein Skulbru
[alias]
c = commit -am
up = pull
p = push
s = status -s
df = diff --color --color-words --abbrev
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
ri = "!r() { git rebase -i HEAD~$1; }; r"
co = checkout
amend = !git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend
ll = log --stat --abbrev-commit
sl = shortlog -sn
fl = log -u
[color]
ui = always
[apply]
whitespace = fix
[core]
excludesfile = /Users/serrghi/.gitignore
attributesfile = ~/.gitattributes
whitespace = fix,space-before-tab,tab-in-indent,trailing-space
[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]
log = true
tool = diffmerge
[url "[email protected]:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "[email protected]:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
# Any GitHub repo with my username should be checked out r/w by default
# http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules
[url "[email protected]:tskulbru/"]
insteadOf = "git://github.com/tskulbru/"
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
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
[credential]
helper = osxkeychain
[push]
default = simple
[jira]
server = https://edbergobergen.jira.com
user = torsku
[jiraflow "development"]
branch = develop
[jiraflow "master"]
branch = master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment