New git alias up

diff --git a/.config/git/config b/.config/git/config
index 5f9572633c2eafd5b8a2435c6e271ff7ceecd0fd..5331f30e142e0d56d4b1b190d83886ae102c430f 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -36,6 +36,9 @@
        required = true
 [alias]
 # shortcuts
+       pp = "!git pull --rebase && git push"
+       up = "!git pull --rebase --prune $@ && git submodule update --init --recursive"
+       co = checkout
        co = checkout
        ci = commit
        st = status
@@ -57,8 +60,6 @@
        go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
        diff = diff --word-diff
        # dont pull without rebase, and dont push without pull (fetch & merge)
-       p = pull --rebase
-       pp = "!git pull --rebase && git push"
        # avoid merge commits
        mf = merge --ff-only
        cp = cherry-pick