X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=38d9c5c93eaa567bf3ea74cc6c00ac4c8b98e073;hb=d7faba863d07e11ff41a4bb7076ffe2b24f8b42e;hp=335be8ee5f980bc57b62db59f45cd131b6c2371a;hpb=8ec2cd351957cd95c7ee6e866da9a828b15d4b73;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 335be8e..38d9c5c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,19 +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
+	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 = rev-parse --show-toplevel
+	#root = !pwd
+	st = status --short
+	stb = status --short --branch
+	tags = tag -l
+	unstage = reset HEAD --
+	wdiff = diff --word-diff
+	wshow = show --word-diff --decorate
 
-[pretty]
-	beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+[branch]
+	autosetuprebase = always
 
-[core]
-	pager = less -FRSXgimq
+[color]
+	ui = auto
+
+[include]
+	path = ~/lib/config/git/light_bg
+
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff
@@ -23,6 +49,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser