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

diff --git a/.gitconfig b/.gitconfig
index 57f7589..3ec2ca0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,14 +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
-	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 = !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
 
-[core]
-	pager = less -FRSXgimq
+[branch]
+	autosetuprebase = always
+
+[color]
+	ui = auto
+
+[include]
+	path = ~/lib/config/git/light_bg
+
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff
@@ -18,6 +49,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser