PS1: shorten slightly & add PS0 recovery

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index d29de085927a82f4972a2bd509aa4aa195893b77..b3201a925db28b5845bf0ac0c97440dbb6ded26a 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -42,7 +42,6 @@
 
 [alias]
        a    = add
-       ab   = abandon
        am-a = am --abort
        am-c = am --continue
        ar   = archive
@@ -57,14 +56,13 @@
        cp-x = cherry-pick -x
        d    = diff
        desc = describe
-       dl   = download
        f    = fetch
        fp   = format-patch -C -M
        g    = grep
        h    = help
        l    = log
        lf   = log --format= --name-only
-       m    = merge --log=50 --no-stat
+       m    = merge --log=100 --no-stat
        rb   = rebase
        rb-d = rebase --committer-date-is-author-date
        rb-a = rebase --abort
@@ -76,7 +74,6 @@
        sm   = submodule
        st   = status
        t    = tag
-       up   = upload
 
 [tag]
        sort = version:refname