fontconfig: -apple-system font

[dotfiles] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 73214501d9d1309c7375e7979257c6bc732aa5ac..c7644b86b15a841003011eaa21e10f5e2907d3ab 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,8 @@
        algorithm = minimal
 [push]
        default = upstream
+[merge]
+       defaultToUpstream = true
 [alias]
        graphlog = log --graph --pretty=format:'%C(bold black)%h%Creset %C(bold red)%ad %C(bold blue)%s%Creset %C(bold yellow)%d%Creset %C(bold black)<%an>%Creset' --date=short
        ci = commit
@@ -33,4 +35,5 @@
        pushf = push --force-with-lease
        cherry-pick = cherry-pick -x
        branches-to-kill = !git branch --merged origin/master|grep -v master|xargs -n1 echo git branch -d
-       mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -
\ No newline at end of file
+       mergediff = !git checkout --quiet --detach HEAD && git merge --no-edit origin/master && git diff -C10 -M10 origin/master && git checkout --quiet -
+       expire-prune = !git reflog expire --expire=now --all && git gc --prune=now
\ No newline at end of file