X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.gitconfig;h=4a411ea5a43ba005fcdb3111908a3989f7d2e440;hp=9320ab50958f4bea8af24a26647972f47e19b96a;hb=6d8fcbe56b488f473406ef26c0c7a3cc2a4f0ce1;hpb=e563dd609f715889e568acab6fd2794187a1ee83

diff --git a/.gitconfig b/.gitconfig
index 9320ab5..4a411ea 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,15 +1,29 @@
 [alias]
 	b = branch
+	camend = commit --amend -C HEAD
 	checkin = commit
 	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
 	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
@@ -74,8 +88,8 @@
 	untracked = red
 	updated = magenta
 
-[core]
-	pager = less -FRSXgimq
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff