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

diff --git a/.gitconfig b/.gitconfig
index 41e7f8a..e4fc7b2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,14 +2,19 @@
 	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 -a
-	camend = commit --amend -C HEAD
+	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
 	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
@@ -20,13 +25,14 @@
 	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:-\"@{u\\}\"}; }; f"
+	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 -l
+	tags = tag --list
 	unstage = reset HEAD --
 	wdiff = diff --word-diff
 	wshow = show --word-diff --decorate