Skip to content

Instantly share code, notes, and snippets.

@dainiusvaznys
Created July 31, 2015 11:04
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dainiusvaznys/3ff2c11e75c778d84c6c to your computer and use it in GitHub Desktop.
Save dainiusvaznys/3ff2c11e75c778d84c6c to your computer and use it in GitHub Desktop.
[user]
name = Dainius Vaznys
email = dainius.vaznys@4finance.com
[push]
default = current
[pretty]
condensed = "format:%C(green)%h %C(white dim)%cd %<|(40,trunc)%an %C(reset)%s"
[format]
pretty = condensed
[log]
date = short
[blame]
date = short
[alias]
ci = commit -a -e
st = status
purge = clean -f -d
purr = pull --rebase
find = !sh -c 'git ls-tree -r --name-only HEAD | grep --color $1' -
in = !git fetch && git log ..FETCH_HEAD
out = !git fetch && git log FETCH_HEAD..
dt = !sh -c 'git difftool -d $1^..$1' -
sq = !sh -c 'git reset --soft HEAD~$1 && git commit' -
drop = "!sh -c \"git st | grep ahead | sed 's/.* by \\([0-9]*\\) commit.*/HEAD~\\1/' | xargs git reset --hard\"" -
remaster = !sh -c 'git checkout master && git branch | grep -v master | xargs git branch -D' -
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld \"$LOCAL\" \"$REMOTE\"
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
cmd = meld \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
[core]
editor = gedit --wait
abbrev = 8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment