X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=e4fc7b27261054d225bb737f77e0a92639acc12d;hb=f74cdd5fbf0ead8d188607abce07297a9e352460;hp=4afa96f5abf39ad57581b71e76c6bad9061e4397;hpb=d8163925c870f7b2c176d0c3d00e945cf05bac16;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 4afa96f..e4fc7b2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,19 +1,53 @@
 [alias]
+	alias = "!f() { [ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && return 0 || echo \"Usage: git alias <new alias> <original command>\" >&2 && return 1; }; f"
+	aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
 	b = branch
+	branches = branch --all
+	cat = cat-file -p
+	dump = cat-file -p
+	file = cat-file -t
+	type = cat-file -t
+	camend = commit --amend --no-edit
 	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
+	incoming = !git remote update --prune; git log ..@{upstream}
+	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
+	outgoing = log @{upstream}..
+	remotes = remote -v
+	ri = "!f() { git rebase --interactive --autosquash --preserve-merges ${1:-\"@{upstream\\}\"}; }; f"
+	#root = !pwd
+	root = rev-parse --show-toplevel
+	st = status --short
+	stb = status --short --branch
+	tags = tag --list
+	unstage = reset HEAD --
+	wdiff = diff --word-diff
+	wshow = show --word-diff --decorate
 
-[pretty]
-	beautiful = format:'%C(blue)%h%Creset (%ar - %C(green)%aN <%aE>%C(reset))%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 +57,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser