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

diff --git a/.gitconfig b/.gitconfig
index 95d1a76..17c893c 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
@@ -16,9 +16,16 @@
 	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
@@ -83,8 +90,8 @@
 	untracked = red
 	updated = magenta
 
-[core]
-	pager = less -FRSXgimq
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff