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

diff --git a/.gitconfig b/.gitconfig
index 09b3a59..e4fc7b2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,6 +14,7 @@
 	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,8 +25,9 @@
 	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