X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=d5535a102d2c0301c94cfb601bf39b770bcbd437;hb=f2763b86760c3b58c1665b0476730aa4db80d858;hp=14b5b731bbf64bf50f75929c11dff77a3cfec89b;hpb=e03dd11d8c4469a0f510d2a046442d504474cfc7;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 14b5b73..d5535a1 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,18 +1,29 @@
 [alias]
-	amend = commit --amend -C HEAD
 	b = branch
+	camend = commit --amend -C HEAD
 	checkin = commit
-	ca = commit --amend
 	ci = commit
 	co = checkout
 	d = diff
 	dc = diff --cached
+	dshow = show --decorate
+	l = log --decorate
+	l1 = log --decorate --oneline
+	l5 = log --decorate -5
 	lg = log --decorate --graph
 	lg1 = log --decorate --graph --oneline
 	lg5 = log --decorate --graph -5
+	lr = log --decorate --reverse
+	lr1 = log --decorate --reverse --oneline
+	lr5 = log --decorate --reverse -5
 	st = status --short
 	stb = status --short --branch
+	unstage = reset HEAD --
 	wdiff = diff --word-diff
+	wshow = show --word-diff --decorate
+
+[branch]
+	autosetuprebase = always
 
 [color]
 	ui = auto
@@ -80,6 +91,9 @@
 [core]
 	pager = less -FRSXgimq
 
+[log]
+	abbrevCommit = true
+
 [merge]
 	tool = vimdiff