gitconfig: Move alias rp to remote section.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 0aaf9c0a2f84aa8cabf1df25bfea8d1787b51b21..451951049df82d3d29a7d74e5faf91a4bf8e6c69 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -51,53 +51,58 @@ include(../lib.m4)
        tag = yes
 
 [alias]
-       # Shortcuts for often used commands.
+       ## Shortcuts for often used commands.
        #
-       # Local.
+       ## 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.
+       ## Branches.
        co  = checkout
        b   = branch -a -v
        br  = branch -a -v
        m   = merge
        me  = merge
-       # Remote.
+       mo  = merge origin/master
+       ## Remote.
        f   = fetch
        fe  = fetch
        t   = tag
        p   = push
        pu  = push
        ru  = remote update
-       # Patches.
+       # Push to all remotes. Thanks to albel727 in #git on Freenode
+       # (2011-06-04 16:06 CEST) for the idea.
+       rp = ! git remote | xargs -L1 -I{} git push {}
+       ## Patches.
        fp  = format-patch
-       # Misc.
-       fs  = fsck --strict --full
+       ## 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
        sa  = stash apply
        ssk = stash save --keep-index
 
-       # Custom commands.
+       ## Custom commands.
        #
        # tig-like log view.
        glog = log --pretty=oneline --graph --all
-       # Push to all remotes. Thanks to albel727 in #git on Freenode
-       # (2011-06-04 16:06 CEST) for the idea.
-       rp = ! git remote | xargs -L1 -I{} git push {}
 
 [diff]
        # Detect copies and renames.
@@ -126,4 +131,4 @@ FI
        # replies to the first one.
        thread = shallow
 
-# vim: ft=gitconfig
+# vim: ft=gitconfig noet