gitconfig: Add mo alias (git merge origin/master).

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index f30716150a830e0dc03e16ea6431ebd7194d3b2d..5e082916128fabf8f1d563e16feb7a457c0586b9 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -56,16 +56,16 @@ include(../lib.m4)
        # Local.
        c   = commit --verbose
        ci  = commit --verbose
-       d   = diff --patience
-       di  = diff --patience
-       dw  = diff --patience --color-words
-       dc  = diff --patience --cached
-       dcw = diff --patience --cached --color-words
+       d   = diff PATIENCE
+       di  = diff PATIENCE
+       dw  = diff PATIENCE --color-words
+       dc  = diff PATIENCE --cached
+       dcw = diff PATIENCE --cached --color-words
        s   = status
        st  = status
        l   = log
        ls  = log --stat
-       lp  = log --patch --patience
+       lp  = log --patch PATIENCE
        a   = add
        ap  = add --patch
        au  = add --update
@@ -75,6 +75,7 @@ include(../lib.m4)
        br  = branch -a -v
        m   = merge
        me  = merge
+       mo  = merge origin/master
        # Remote.
        f   = fetch
        fe  = fetch
@@ -87,6 +88,7 @@ include(../lib.m4)
        # Maintenance. (Redirection of stderr is necessary to prevent missing
        # output with my "color stderr" solution in Zsh.)
        fs  = ! git fsck --strict --full 2>&1
+       fg  = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
        # Misc.
        sl  = stash list
        ss  = stash save