X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=17c893cb8649d011724a991c10eedfdf20e45625;hb=2d2048f5ff5f0ce412d6d60bce2b3da3214d8d07;hp=7dc2aa096fd115a2b9d14061550a707efc602e43;hpb=ec5a183b8c62cccf786477e38f9c061059bc598d;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 7dc2aa0..17c893c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,17 +1,31 @@
 [alias]
-	amend = commit --amend -C HEAD
 	b = branch
+	camend = commit --amend -C HEAD
 	checkin = commit
-	ca = commit --amend
 	ci = commit
 	co = checkout
-	l1 = log --oneline
-	l5 = log -5
+	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
+	root = rev-parse --show-toplevel
+	#root = !pwd
 	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
@@ -76,8 +90,8 @@
 	untracked = red
 	updated = magenta
 
-[core]
-	pager = less -FRSXgimq
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff