.gitconfig: add incoming/outgoing aliases

diff --git a/.gitconfig b/.gitconfig
index 09b3a590259efb0f9fb5f961d50edc32fcf70985..e4fc7b27261054d225bb737f77e0a92639acc12d 100644 (file)
--- 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