Created
March 25, 2017 20:24
-
-
Save diresi/8b123573e4e52021389835689baadde7 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[core] | |
abbrev = 12 | |
[user] | |
name = Christoph Rissner | |
email = resi@rissner.net | |
[push] | |
default = matching | |
[alias] | |
glog = !GIT_PAGER='less +/HEAD' git log --graph --all --decorate | |
log = log --decorate | |
vlog = log --decorate --stat | |
slog = log --decorate --graph --oneline | |
st = status -s | |
sync = ! CUR=$(git branch | grep '*' | cut -c 3-) \ | |
&& git stash \ | |
&& git checkout master \ | |
&& git pull upstream master \ | |
&& MERGED=$(git branch --merged | grep -vE '([*]|master)') || true \ | |
&& git branch -d ${MERGED} || true \ | |
&& git remote prune origin \ | |
&& git checkout ${CUR} || true \ | |
&& git stash pop || true | |
[log] | |
decorate = true | |
[sendemail] | |
smtpServer = knecht.flinkwork.com | |
smtpServerPort = 25 | |
cc = cri@flinkwork.com | |