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

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index a48ee485d03192d4b96c0ba581101c61485a05ee..5e082916128fabf8f1d563e16feb7a457c0586b9 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -56,25 +56,26 @@ 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
        # Branches.
        co  = checkout
-       b   = branch --all --verbose
-       br  = branch --all --verbose
+       b   = branch -a -v
+       br  = branch -a -v
        m   = merge
        me  = merge
+       mo  = merge origin/master
        # Remote.
        f   = fetch
        fe  = fetch
@@ -84,8 +85,11 @@ include(../lib.m4)
        ru  = remote update
        # Patches.
        fp  = format-patch
+       # 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.
-       fs  = fsck --strict --full
        sl  = stash list
        ss  = stash save
        sa  = stash apply
@@ -126,4 +130,4 @@ FI
        # replies to the first one.
        thread = shallow
 
-# vim: ft=gitconfig
+# vim: ft=gitconfig noet