From: Oleg Broytman <phd@phdru.name>
Date: Sat, 14 May 2016 22:23:46 +0000 (+0300)
Subject: .gitconfig: add incoming/outgoing aliases
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=11ede453aa70361b925762e56a44509b47669559;p=dotfiles.git

.gitconfig: add incoming/outgoing aliases
---

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