summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--gitconfig17
1 files changed, 5 insertions, 12 deletions
diff --git a/gitconfig b/gitconfig
index b672612..18e97ac 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,30 +1,23 @@
 [color]
-	status = auto
-	branch = auto
-	diff = auto
+	ui = true
 
-[i18n]
-	commitencoding = utf-8
+[push]
+	default = simple
 
 [alias]
 	amend = commit --amend
 	br = branch
 	ci = commit
 	co = checkout
-	fixup = rebase -i HEAD~5
 	g = "grep --heading --break"
-	lt = log --oneline --graph --all
-	l = log --pretty=format:'%<(10)%h %<(20)%an %s'
 	pending = !GIT_CURRENT_BRANCH=$(git name-rev --name-only HEAD) && git log origin/$GIT_CURRENT_BRANCH..$GIT_CURRENT_BRANCH --oneline
 	pr = pull --rebase
-	st = status  -s
-	stat = show HEAD --stat
-	wip = commit -a -m WIP
+	st = status -sb
+	lg = log --graph --oneline --decorate
 
 [core]
 	whitespace = trailing-space,space-before-tab
 	excludesfile = ~/.gitignore
-	pager = less -+$LESS -R
 
 [branch]
 	autosetuprebase = remote