gitconfig: Remove unnecessary aliases.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index e361a07dfdd8daa5e21f543b6f407c785ec056b9..c7397a0557285431f8df9845165a3a110c3d3842 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -42,6 +42,9 @@ include(../lib.m4)
 
 [core]
        editor = vim
+       # Global gitattributes file. Thanks to canton7 in #git on Freenode
+       # (2011-11-09 13:23 CET).
+       attributesfile = PWD/gitattributes
 
 # Use pager for the following commands.
 [pager]
@@ -50,7 +53,8 @@ include(../lib.m4)
 
 [interactive]
        # Don't require <Return> in interactive commands which require only a
-       # single key, for example `git add --patch`.
+       # single key, for example `git add --patch`. Requires Perl module
+       # Term::Readkey.
        singlekey = yes
 
 [alias]
@@ -58,16 +62,13 @@ include(../lib.m4)
        #
        ## Local.
        c   = commit --verbose
-       ci  = commit --verbose
        ca  = commit --verbose --amend
        cad = commit --verbose --amend --date=
        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
@@ -78,16 +79,12 @@ include(../lib.m4)
        ## Branches.
        co  = checkout
        b   = branch -a -v
-       br  = branch -a -v
        m   = merge
-       me  = merge
        mo  = merge origin/master
        ## Remote.
        f   = fetch
-       fe  = fetch
        t   = tag
        p   = push
-       pu  = push
        # Parallel git remote update. Also strips unnecessary output.
        ru = "! git remote \
              | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
@@ -191,4 +188,4 @@ FI
        # receive-pack and git fetch (>= 1.7.8, for fetch)).
        fsckobjects = true
 
-# vim: ft=gitconfig noet
+# vim: ft=gitconfig