X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=b3e81d7b57c30205123d0c285b47ee2d2843e0ac;hb=0392d068380d0ca8170f6959badd1a4dd4a67c70;hp=baccece3c3576a1bc12dae9b8f50ba386032dde9;hpb=e991ec16828b262c0e90677d6ba9f258d81b6b9c;p=dotfiles.git

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