X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=3ec2ca05f54a90d0bb9b19030895b8c06467c29b;hb=5623dbd17dda9363bf205e7772ef1d6fe7895074;hp=83f1bee08ceccdc61ab4232747a6539ff210b55f;hpb=50e5d822ebe0c7bd41cafddc120ce31480494703;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 83f1bee..3ec2ca0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,67 +1,45 @@
 [alias]
 	b = branch
+	branches = branch -a
+	camend = commit --amend -C HEAD
 	checkin = commit
 	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
+	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
+	null-merge = merge --strategy=ours
+	remotes = remote -v
+	ri = "!sh -c 'git rebase --interactive --autosquash --preserve-merges ${1:-\"@{u\\}\"}' -"
+	#root = !pwd
+	root = rev-parse --show-toplevel
+	st = status --short
+	stb = status --short --branch
+	tags = tag -l
+	unstage = reset HEAD --
+	wdiff = diff --word-diff
+	wshow = show --word-diff --decorate
+
+[branch]
+	autosetuprebase = always
 
 [color]
 	ui = auto
 
-[color "branch"]
-#	-- default --
-#	current = green
-#	local = normal
-#	plain = normal
-#	remote = red
-#	-- light bg --
-	current = blue
-	remote = magenta
-[color "diff"]
-#	-- default --
-#	commit = yellow
-#	frag = cyan
-#	meta = bold
-#	new = green
-#	old = red
-#	plain = normal
-#	whitespace = normal red
-#	-- light bg --
-	commit = normal bold
-	frag = green
-	new = blue
-	old = magenta
-#[color "grep"]
-#	-- default --
-#	match = normal
-#[color "interactive"]
-#	-- default --
-#	error = normal
-#	header = normal
-#	help = normal
-#	prompt = normal
-[color "status"]
-#	-- default --
-#	added = red
-#	changed = red
-#	header = normal
-#	nobranch = red
-#	untracked = red
-#	updated = green
-#	-- light bg --
-	added = blue
-	changed = blue
-	updated = magenta
+[include]
+	path = ~/lib/config/git/light_bg
 
-[core]
-	pager = less -FRSXgimq
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff