Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Fetching contributors…

Cannot retrieve contributors at this time

133 lines (103 sloc) 2.988 kB
[user]
email = thlorenz@gmx.de
name = Thorsten Lorenz
[core]
editor = vim
excludesfile = /Users/thlorenz/.gitignore
[core "diff"]
tool = vimdiff
[color]
diff = true
ui = always
[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 = red
untracked = blue
[diff]
tool = vimdiff
[merge]
tool = vimdiff
# Include summaries of merged commits in newly created merge commit messages
log = true
[difftool]
prompt = false
[branch "master"]
# Use `origin` as the default remote on the `master` branch in all cases
remote = origin
merge = refs/heads/master
[push]
default = current
[alias]
# Lots came from:
# http://durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/
# http://lukas.zapletalovi.com/2012/07/my-git-aliases-again.html
# List all aliases
al = "!git config -l | grep alias | cut -c 7-"
# Logs
## Summary with relative dates
lg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
## Very short summary (not authors or dates)
ls = log --oneline --decorate
## Details (includes changed files)
ll = log --pretty=format:'%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]' --decorate --numstat
## Details of specific revision
llr = "!f() { git ll "$1"^.."$1"; }; f"
## Summary without Colors to allow piping
lnc = log --pretty=format:'%h\\ %s\\ [%cn]'
## Log differences between master and current branch (i.e. history since branching)
lh = !git --no-pager log origin/master..HEAD --abbrev-commit --pretty=oneline
# Diffs
## Show modified files in last commit
dl = !git ll -1
## Show diff of last commit
dlc = diff --cached HEAD^
## Show diff of specific revision
## Example: git dr HEAD~2
dr = "!f() { git diff "$1"^.."$1"; }; f"
dtr = "!f() { git difftool "$1"^.."$1"; }; f"
dt = difftool
dc = diff --cached
# Grep
## Find filepath in codebase
f = "!git ls-files | grep -i"
# Remotes
## Push origin/master showing differences and allowing abort
pom = !sh -c 'git lh && echo Ready to push? ENTER && read && git push origin master' -
ra = remote add
rr = remote remove
rsu = remote set-url
pu = pull
pur = pull --rebase
cl = clone
# Workflow
st = status --ignore-submodules -s
co = checkout
ci = commit
cm = commit -m
cam = commit -am
br = branch -v
amd = commit --amend --no-edit
[mergetool]
keepBackup = true
[credential]
helper = cache --timeout=1800
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[rerere]
enabled = 1
autoupdate = true
[fetch]
prune = true
# Only needed for Gist.vim - screws up main user somehow
# [github]
# user = thlorenz
Jump to Line
Something went wrong with that request. Please try again.