X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=7abcd3f3665c6299916e86e1ba88ce496e150a99;hb=f7c63cf4c6268dce1643f15c72964495db8f72b3;hp=e9374d83c1f0e5aa94d9a93d54a9d117a140adad;hpb=96d39e52adba892c81c68f02859bb116370208d0;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index e9374d8..7abcd3f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,18 +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
+	branches = branch --all
 	cat = cat-file -p
 	dump = cat-file -p
 	file = cat-file -t
 	type = cat-file -t
-	camend = commit --amend -C HEAD
+	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
@@ -24,13 +25,15 @@
 	lr1 = log --decorate --reverse --oneline
 	lr5 = log --decorate --reverse -5
 	null-merge = merge --strategy=ours
+	outgoing = log @{upstream}..
+	push2all = !git remote | xargs -I% -n1 git push %
 	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
@@ -55,6 +58,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[push]
+	default = simple
+
 [receive]
 	denyNonFastForwards = true