gitconfig: Set receive.fsckobjects.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 91e1f3d3e265d164b04e14bba6b64c74f72509b1..439f7808977f5864c0beb026fa27115b6faf0bd4 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -26,6 +26,20 @@ include(../lib.m4)
 [color]
        ui = auto
 
+[color "diff"]
+       # Meta information.
+       meta = yellow bold
+       # Hunk header.
+       frag = magenta bold
+       # Function in hunk header.
+       function = magenta bold
+       # Removed lines.
+       old = red bold
+       # Added lines.
+       new = green bold
+       # Commit headers.
+       commit = cyan
+
 [core]
        editor = vim
        # Can't use ~/ because of older git versions.
@@ -37,47 +51,65 @@ 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 --all --verbose
-       br  = branch --all --verbose
+       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.
+       # Parallel git remote update. Also strips unnecessary output.
+       ru = "! git remote \
+             | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
+             | sed '/^$/d; \
+                    /^Please make sure you have the correct access rights$/d; \
+                    /^and the repository exists\\.$/d;'"
+       # Push to all remotes. Thanks to albel727 in #git on Freenode
+       # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
+       # and to strip unnecessary output.
+       rp = "! git remote \
+             | xargs -d '\\n' -n1 -P0 git push 2>&1 \
+             | sed '/^$/d; \
+                    /^Please make sure you have the correct access rights$/d; \
+                    /^and the repository exists\\.$/d;'"
+       ## 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
@@ -109,4 +141,9 @@ FI
        # replies to the first one.
        thread = shallow
 
-# vim: ft=gitconfig
+[receive]
+       # Automatically fsck objects when receiving them (respected by git
+       # receive-pack and git fetch (>= 1.7.8, for fetch)).
+       fsckobjects = true
+
+# vim: ft=gitconfig noet