X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=14b5b731bbf64bf50f75929c11dff77a3cfec89b;hb=e03dd11d8c4469a0f510d2a046442d504474cfc7;hp=3a8714224789be7bf96eba8ca9e85a78bc12f05f;hpb=ee7bc0c6f78a3423c466268ed5a3bc9ca7c69956;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 3a87142..14b5b73 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,16 +1,18 @@
 [alias]
+	amend = commit --amend -C HEAD
 	b = branch
 	checkin = commit
+	ca = commit --amend
 	ci = commit
 	co = checkout
-	l1 = log --oneline
-	l5 = log -5
-	lb = log --decorate --graph --stat --pretty=beautiful
-	lb5 = log --decorate --graph --stat --pretty=beautiful -5
-	st = status -s
-
-[pretty]
-	beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+	d = diff
+	dc = diff --cached
+	lg = log --decorate --graph
+	lg1 = log --decorate --graph --oneline
+	lg5 = log --decorate --graph -5
+	st = status --short
+	stb = status --short --branch
+	wdiff = diff --word-diff
 
 [color]
 	ui = auto
@@ -22,7 +24,7 @@
 #	current = green
 #	local = normal
 #	plain = normal
-#	remote = red
+#	remote = magenta
 #	-- light bg --
 	current = blue
 	local = normal
@@ -31,11 +33,11 @@
 	upstream = normal
 [color "diff"]
 #	-- default --
-#	commit = yellow
+#	commit = bold yellow
 #	frag = cyan
-#	meta = bold
+#	meta = cyan
 #	new = green
-#	old = red
+#	old = magenta
 #	plain = normal
 #	whitespace = normal red
 #	-- light bg --
@@ -61,8 +63,8 @@
 #	prompt = normal
 [color "status"]
 #	-- default --
-#	added = red
-#	changed = red
+#	added = cyan
+#	changed = magenta
 #	header = normal
 #	nobranch = red
 #	untracked = red