Skip to content

Instantly share code, notes, and snippets.

@lukaszraczylo
Created May 25, 2018 14:02
Show Gist options
  • Save lukaszraczylo/6f638466ad45a39099b2d879f0f60f6e to your computer and use it in GitHub Desktop.
Save lukaszraczylo/6f638466ad45a39099b2d879f0f60f6e to your computer and use it in GitHub Desktop.
[user]
name = Lukasz Raczylo
email = EDITED
signingkey = EDITED
[core]
whitespace = trailing-space,space-before-tab
excludesfile = *.un~
editor = subl -n -w
[apply]
whitespace = fix
[push]
default = simple
[help]
autocorrect = 1
[branch]
autosetuprebase = always
autosetupmerge = true
[color]
ui = auto
interactive = auto
[remote "origin"]
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
[alias]
rebase = rebase --autosquash
co = checkout
# commits
cms = commit -a -S
a = add -A .
cm = commit -am
fix = "!git commit -a -S --fixup $(git log --pretty=format:\"%h\" -1)"
fn = fetch origin +refs/pull/*/head:refs/remotes/origin/pr/*
ls = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
lg = log --graph --pretty=format:'%C(magenta)%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
pre = pull --rebase
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
st = status -sb
rank = shortlog -sn --no-merges
cleanup = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d"
sl = stash list
ss = stash save
sa = stash apply
dif = diff --staged
branches = for-each-ref --sort=-committerdate refs/heads/ --format='%(committerdate:short) %(authorname) %(refname:short) %(objectname:short)'
po = push origin
cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop\\|dev' | xargs -n 1 git branch -d"
[rerere]
enabled = true
autoupdate = true
[merge]
stat = true
[credential]
helper = osxkeychain
[filter "lfs"]
required = true
clean = git-lfs clean %f
smudge = git-lfs smudge %f
[commit]
gpgsign = true
[diff]
mnemonicprefix = true
[rebase]
autosquash = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment