X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=66a284234459b24f18c87522514305651b27339f;hb=6a0e2cd17c1ee99bc8a508ba138332c4a2edae66;hp=95d1a76305ce34529033bc903573684983786b80;hpb=75af2b5222aa784a59f144e51f0ec83e64bd5210;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 95d1a76..66a2842 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,12 +1,12 @@
 [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
@@ -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